Merge branch 'develop' into operations_service

[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 7b401ed..d2a42c7 100644 (file)
--- a/src/com/owncloud/android/media/MediaServiceBinder.java
+++ b/src/com/owncloud/android/media/MediaServiceBinder.java
@@ -1,10 +1,9 @@
 /* ownCloud Android client application
 /* ownCloud Android client application

- *   Copyright (C) 2013 ownCloud Inc.
+ *   Copyright (C) 2012-2013 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -21,12 +20,12 @@ package com.owncloud.android.media;
 
 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.media.MediaPlayer;
 import android.os.Binder;
 
 import android.accounts.Account;
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.os.Binder;

-import android.util.Log;

 import android.widget.MediaController;
 
 
 import android.widget.MediaController;
 
 


@@ -129,13 +128,13 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
     
     @Override
     public void pause() {
     
     @Override
     public void pause() {

-        Log.d(TAG, "Pausing through binder...");
+        Log_OC.d(TAG, "Pausing through binder...");

         mService.processPauseRequest();
     }
 
     @Override
     public void seekTo(int pos) {
         mService.processPauseRequest();
     }
 
     @Override
     public void seekTo(int pos) {

-        Log.d(TAG, "Seeking " + pos + " through binder...");
+        Log_OC.d(TAG, "Seeking " + pos + " through binder...");

         MediaPlayer currentPlayer = mService.getPlayer();
         MediaService.State currentState = mService.getState();
         if (currentPlayer != null && currentState != State.PREPARING && currentState != State.STOPPED) {
         MediaPlayer currentPlayer = mService.getPlayer();
         MediaService.State currentState = mService.getState();
         if (currentPlayer != null && currentState != State.PREPARING && currentState != State.STOPPED) {


@@ -145,12 +144,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
 
     @Override
     public void start() {
 
     @Override
     public void start() {

-        Log.d(TAG, "Starting through binder...");
+        Log_OC.d(TAG, "Starting through binder...");

         mService.processPlayRequest();  // this will finish the service if there is no file preloaded to play
     }
     
     public void start(Account account, OCFile file, boolean playImmediately, int position) {
         mService.processPlayRequest();  // this will finish the service if there is no file preloaded to play
     }
     
     public void start(Account account, OCFile file, boolean playImmediately, int position) {

-        Log.d(TAG, "Loading and starting through binder...");
+        Log_OC.d(TAG, "Loading and starting through binder...");

         Intent i = new Intent(mService, MediaService.class);
         i.putExtra(MediaService.EXTRA_ACCOUNT, account);
         i.putExtra(MediaService.EXTRA_FILE, file);
         Intent i = new Intent(mService, MediaService.class);
         i.putExtra(MediaService.EXTRA_ACCOUNT, account);
         i.putExtra(MediaService.EXTRA_FILE, file);


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

 }
 
 
 }