Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6a292f authored by Ivan Lozano's avatar Ivan Lozano Committed by Android (Google) Code Review
Browse files

Merge "Moving IPlayer.aidl to frameworks/av/."

parents 28a8114a 330d876a
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ LOCAL_SRC_FILES += \
	media/java/android/media/IMediaScannerListener.aidl \
	media/java/android/media/IMediaScannerService.aidl \
	media/java/android/media/IPlaybackConfigDispatcher.aidl \
	media/java/android/media/IPlayer.aidl \
	../av/media/libaudioclient/aidl/android/media/IPlayer.aidl \
	media/java/android/media/IRecordingConfigDispatcher.aidl \
	media/java/android/media/IRemoteDisplayCallback.aidl \
	media/java/android/media/IRemoteDisplayProvider.aidl \
@@ -587,6 +587,7 @@ LOCAL_AIDL_INCLUDES += \
LOCAL_AIDL_INCLUDES += \
	frameworks/av/camera/aidl \
	frameworks/av/drm/libmediadrm/aidl \
	frameworks/av/media/libaudioclient/aidl \
	frameworks/native/aidl/gui \
	system/netd/server/binder \
	system/bt/binder
+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@

using namespace android;

using ::android::media::VolumeShaper;

// ----------------------------------------------------------------------------
static const char* const kClassPathName = "android/media/AudioTrack";
static const char* const kAudioAttributesClassPathName = "android/media/AudioAttributes";
+0 −33
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.media;

import android.media.VolumeShaper;

/**
 * @hide
 */
interface IPlayer {
    oneway void start();
    oneway void pause();
    oneway void stop();
    oneway void setVolume(float vol);
    oneway void setPan(float pan);
    oneway void setStartDelayMs(int delayMs);
    oneway void applyVolumeShaper(in VolumeShaper.Configuration configuration,
                                  in VolumeShaper.Operation operation);
}
+0 −21
Original line number Diff line number Diff line
/*
 * Copyright 2017 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.media;

parcelable VolumeShaper.Configuration;
parcelable VolumeShaper.Operation;
parcelable VolumeShaper.State;
 No newline at end of file
+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ static StateExceptionFields gStateExceptionFields;

using namespace android;

using media::VolumeShaper;

// ----------------------------------------------------------------------------

struct fields_t {
Loading