Removed use of StreamPlayerCbEnded()

BearWare · Oct 7, 2019 · 2bced8f · 2bced8f
1 parent dfce6fc
commit 2bced8f
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 45 deletions.
diff --git a/Library/TeamTalkLib/avstream/MediaPlayback.cpp b/Library/TeamTalkLib/avstream/MediaPlayback.cpp
@@ -307,6 +307,3 @@ bool MediaPlayback::StreamPlayerCb(const soundsystem::OutputStreamer& streamer,
     return true;
 }
 
-void MediaPlayback::StreamPlayerCbEnded()
-{
-}
diff --git a/Library/TeamTalkLib/avstream/MediaPlayback.h b/Library/TeamTalkLib/avstream/MediaPlayback.h
@@ -83,7 +83,6 @@ class MediaPlayback : public MediaStreamListener
     // StreamPlayer
     bool StreamPlayerCb(const soundsystem::OutputStreamer& streamer, 
                         short* buffer, int samples);
-    void StreamPlayerCbEnded();
 
 private:
     media_streamer_t m_streamer;

diff --git a/Library/TeamTalkLib/avstream/OpenSLESWrapper.cpp b/Library/TeamTalkLib/avstream/OpenSLESWrapper.cpp
@@ -437,7 +437,6 @@ void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
 
     if(!more)
     {
-        streamer->player->StreamPlayerCbEnded();
         SLPlayItf playerPlay = streamer->playerPlay;
 
         // set the player's state to stopped

diff --git a/Library/TeamTalkLib/avstream/PortAudioWrapper.cpp b/Library/TeamTalkLib/avstream/PortAudioWrapper.cpp
@@ -393,14 +393,6 @@ int OutputStreamCallback(const void *inputBuffer, void *outputBuffer,
         return paComplete;
 }
 
-void OutputStreamCallbackEnded(void* userData)
-{
-    assert(userData);
-    PaOutputStreamer* streamer = static_cast<PaOutputStreamer*> (userData);
-    streamer->player->StreamPlayerCbEnded();
-}
-
-
 outputstreamer_t PortAudio::NewStream(StreamPlayer* player, int outputdeviceid,
                                       int sndgrpid, int samplerate, int channels,
                                       int framesize)
@@ -436,14 +428,6 @@ outputstreamer_t PortAudio::NewStream(StreamPlayer* player, int outputdeviceid,
         return outputstreamer_t();
     }
 
-    err = Pa_SetStreamFinishedCallback(streamer->stream, OutputStreamCallbackEnded);
-    assert(err == paNoError);
-
-    if(err != paNoError)
-    {
-        return outputstreamer_t();
-    }
-
     //set master volume so it's relative to master volume
     SetVolume(player, VOLUME_DEFAULT);
 

diff --git a/Library/TeamTalkLib/avstream/SoundLoopback.cpp b/Library/TeamTalkLib/avstream/SoundLoopback.cpp
@@ -298,11 +298,6 @@ bool SoundLoopback::StreamPlayerCb(const soundsystem::OutputStreamer& streamer,
     return true;
 }
 
-void SoundLoopback::StreamPlayerCbEnded()
-{
-}
-
-
 void SoundLoopback::StreamDuplexEchoCb(const soundsystem::DuplexStreamer& streamer,
                                        const short* input_buffer, 
                                        const short* prev_output_buffer, int samples)

diff --git a/Library/TeamTalkLib/avstream/SoundLoopback.h b/Library/TeamTalkLib/avstream/SoundLoopback.h
@@ -68,7 +68,6 @@ class SoundLoopback
                          const short* buffer, int samples);
     bool StreamPlayerCb(const soundsystem::OutputStreamer& streamer, 
                         short* buffer, int samples);
-    void StreamPlayerCbEnded();
 
     void StreamDuplexEchoCb(const soundsystem::DuplexStreamer& streamer,
                             const short* input_buffer, 

diff --git a/Library/TeamTalkLib/avstream/SoundSystem.h b/Library/TeamTalkLib/avstream/SoundSystem.h
@@ -281,7 +281,6 @@ namespace soundsystem {
         virtual ~StreamPlayer() {}
         virtual bool StreamPlayerCb(const OutputStreamer& streamer, 
                                     short* buffer, int samples) = 0;
-        virtual void StreamPlayerCbEnded() = 0;
     };
 
     class StreamDuplex

diff --git a/Library/TeamTalkLib/avstream/SoundSystemBase.cpp b/Library/TeamTalkLib/avstream/SoundSystemBase.cpp
@@ -77,7 +77,6 @@ void DuplexEnded(SoundSystem* sndsys, DuplexStreamer& dpxStream)
     while(i--)
     {
         player = dpxStream.players[i]->player;
-        player->StreamPlayerCbEnded();
         sndsys->RemoveDuplexOutputStream(dpxStream.duplex, player);
     }
 }

diff --git a/Library/TeamTalkLib/avstream/SoundSystemBase.h b/Library/TeamTalkLib/avstream/SoundSystemBase.h
@@ -132,7 +132,6 @@ namespace soundsystem {
 
         virtual ~StreamPlayerCallback()
         {
-            m_streamer->player->StreamPlayerCbEnded();
             Stop();
         }
 
@@ -1108,9 +1107,6 @@ namespace soundsystem {
             }
             g2.release();
 
-            //simulate to player that this was the last callback
-            player->StreamPlayerCbEnded();
-
             wguard_t g(players_lock());
             m_output_streamers.erase(player);
             return true;

diff --git a/Library/TeamTalkLib/teamtalk/client/StreamPlayers.cpp b/Library/TeamTalkLib/teamtalk/client/StreamPlayers.cpp
@@ -199,8 +199,8 @@ bool AudioPlayer::StreamPlayerCb(const soundsystem::OutputStreamer& streamer,
         m_talking = false;
 
         //store in muxer (if enabled)
-        m_audiomuxer.QueueUserAudio(m_userid, NULL, m_samples_played, 
-                                    false, m_codec);
+        m_audiomuxer.QueueUserAudio(m_userid, nullptr, m_samples_played, 
+                                    true, m_codec);
         //reset packet numbers
         Reset();
     }
@@ -232,15 +232,6 @@ bool AudioPlayer::StreamPlayerCb(const soundsystem::OutputStreamer& streamer,
     return true;
 }
 
-void AudioPlayer::StreamPlayerCbEnded()
-{
-    m_audiomuxer.QueueUserAudio(m_userid, NULL, 
-                                m_samples_played, true,
-                                m_codec);
-    //MYTRACE(ACE_TEXT("Stream callback ended for #%d. Played: %u. Cur pkt: %d, max pkt: %d\n"),
-    //        m_userid, m_samples_played, m_play_pkt_no, m_max_packet);
-}
-
 int AudioPlayer::GetNumAudioBlocks(bool reset)
 {
     int n = m_new_audio_blocks;

diff --git a/Library/TeamTalkLib/teamtalk/client/StreamPlayers.h b/Library/TeamTalkLib/teamtalk/client/StreamPlayers.h
@@ -85,7 +85,6 @@ namespace teamtalk {
 
         virtual bool StreamPlayerCb(const soundsystem::OutputStreamer& streamer,
                                     short* output_buffer, int n_samples);
-        virtual void StreamPlayerCbEnded();
 
         bool PlayBuffer(short* output_buffer, int n_samples);
         virtual bool DecodeFrame(const encframe& enc_frame,