Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop

[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..d2a42c7 100644 (file)
--- a/src/com/owncloud/android/media/MediaServiceBinder.java
+++ b/src/com/owncloud/android/media/MediaServiceBinder.java
@@ -18,9 +18,9 @@
 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.media.MediaService.State;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.media.MediaService.State;

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

 
 import android.accounts.Account;
 import android.content.Intent;
 
 import android.accounts.Account;
 import android.content.Intent;


@@ -176,6 +176,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
+    }
+

 }
 
 
 }