X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/274dfd295815a7071c34d19ffe8eb9b81b78a805..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 d2c52484..d2a42c77 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -1,10 +1,9 @@ /* 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 - * 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 @@ -19,9 +18,9 @@ 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.utils.Log_OC; import android.accounts.Account; import android.content.Intent; @@ -177,6 +176,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP return (currentState == MediaService.State.PLAYING || currentState == MediaService.State.PAUSED); } + + @Override + public int getAudioSessionId() { + return 1; // not really used + } + }