Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList

[pub/Android/ownCloud.git] / src / com / owncloud / android / media / MediaServiceBinder.java

diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java
index 4fab8bd..95bf520 100644 (file)
--- a/src/com/owncloud/android/media/MediaServiceBinder.java
+++ b/src/com/owncloud/android/media/MediaServiceBinder.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2013 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -18,8 +21,8 @@
 package com.owncloud.android.media;
 
 
 package com.owncloud.android.media;
 
 

-import com.owncloud.android.Log_OC;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCFile;

+import com.owncloud.android.lib.common.utils.Log_OC;

 import com.owncloud.android.media.MediaService.State;
 
 import android.accounts.Account;
 import com.owncloud.android.media.MediaService.State;
 
 import android.accounts.Account;


@@ -34,8 +37,6 @@ import android.widget.MediaController;
  * 
  *  Provides the operations of {@link MediaController.MediaPlayerControl}, and an extra method to check if
  *  an {@link OCFile} instance is handled by the MediaService.
  * 
  *  Provides the operations of {@link MediaController.MediaPlayerControl}, and an extra method to check if
  *  an {@link OCFile} instance is handled by the MediaService.

- *  
- *  @author David A. Velasco

  */
 public class MediaServiceBinder extends Binder implements MediaController.MediaPlayerControl {
 
  */
 public class MediaServiceBinder extends Binder implements MediaController.MediaPlayerControl {
 


@@ -176,6 +177,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
         return (currentState == MediaService.State.PLAYING || currentState == MediaService.State.PAUSED);
     }
 
         return (currentState == MediaService.State.PLAYING || currentState == MediaService.State.PAUSED);
     }
 

+
+    @Override
+    public int getAudioSessionId() {
+        return 1; // not really used
+    }
+

 }
 
 
 }