X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/274dfd295815a7071c34d19ffe8eb9b81b78a805..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/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..95bf5207 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -1,10 +1,12 @@ -/* ownCloud Android client application - * Copyright (C) 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 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,8 +21,8 @@ package com.owncloud.android.media; -import com.owncloud.android.Log_OC; 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; @@ -35,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. - * - * @author David A. Velasco */ public class MediaServiceBinder extends Binder implements MediaController.MediaPlayerControl { @@ -177,6 +177,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 + } + }