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

Commit 3c0fb1ee authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "libmedia: Add backward-compatible constructors" 

Still working on this, unbreaking the build for now.

This reverts commit 878aa8b8.
parent 878aa8b8

include/media/AudioRecord.h

+0 −9
Original line number Diff line number Diff line
@@ -158,15 +158,6 @@ public: 
                                    int notificationFrames = 0,

                                    int sessionId = 0);



                        AudioRecord(int inputSource,

                                    uint32_t sampleRate = 0,

                                    int format          = 0,

                                    uint32_t channels = AudioSystem::CHANNEL_IN_MONO,

                                    int frameCount      = 0,

                                    uint32_t flags      = 0,

                                    callback_t cbf = 0,

                                    void* user = 0,

                                    int notificationFrames = 0);



    /* Terminates the AudioRecord and unregisters it from AudioFlinger.

     * Also destroys all resources assotiated with the AudioRecord.

include/media/AudioTrack.h

+0 −10
Original line number Diff line number Diff line
@@ -152,16 +152,6 @@ public: 
                                    int notificationFrames = 0,

                                    int sessionId = 0);



                        AudioTrack( int streamType,

                                    uint32_t sampleRate  = 0,

                                    int format           = 0,

                                    int channels         = 0,

                                    int frameCount       = 0,

                                    uint32_t flags       = 0,

                                    callback_t cbf       = 0,

                                    void* user           = 0,

                                    int notificationFrames = 0);



    /* Creates an audio track and registers it with AudioFlinger. With this constructor,

     * The PCM data to be rendered by AudioTrack is passed in a shared memory buffer

     * identified by the argument sharedBuffer. This prototype is for static buffer playback.

media/libmedia/AudioRecord.cpp

+0 −16
Original line number Diff line number Diff line
@@ -98,22 +98,6 @@ AudioRecord::AudioRecord( 
            frameCount, flags, cbf, user, notificationFrames, sessionId);

}



AudioRecord::AudioRecord(

        int inputSource,

        uint32_t sampleRate,

        int format,

        uint32_t channels,

        int frameCount,

        uint32_t flags,

        callback_t cbf,

        void* user,

        int notificationFrames)

    : mStatus(NO_INIT), mSessionId(0)

{

    mStatus = set(inputSource, sampleRate, format, channels,

            frameCount, flags, cbf, user, notificationFrames, 0);

}



AudioRecord::~AudioRecord()

{

    if (mStatus == NO_ERROR) {

media/libmedia/AudioTrack.cpp

+0 −17
Original line number Diff line number Diff line
@@ -96,23 +96,6 @@ AudioTrack::AudioTrack( 
            0, false, sessionId);

}



AudioTrack::AudioTrack(

        int streamType,

        uint32_t sampleRate,

        int format,

        int channels,

        int frameCount,

        uint32_t flags,

        callback_t cbf,

        void* user,

        int notificationFrames)

    : mStatus(NO_INIT)

{

    mStatus = set(streamType, sampleRate, format, channels,

            frameCount, flags, cbf, user, notificationFrames,

            0, false, 0);

}



AudioTrack::AudioTrack(

        int streamType,

        uint32_t sampleRate,