@@ -269,19 +269,9 @@ static const char *getAppName(void)
269
269
return SDL_GetAppMetadataProperty (SDL_PROP_APP_METADATA_NAME_STRING );
270
270
}
271
271
272
- static void ThreadedMainloopSignal (void )
273
- {
274
- PULSEAUDIO_pa_threaded_mainloop_signal (pulseaudio_threaded_mainloop , 0 ); // alert waiting threads to unblock.
275
-
276
- // we need to kill any SDL_SetError state; we didn't create this thread
277
- // so its SDL TLS slot will leak otherwise, so we do this every time
278
- // we're (presumably) losing control of the thread.
279
- SDL_CleanupTLS ();
280
- }
281
-
282
272
static void OperationStateChangeCallback (pa_operation * o , void * userdata )
283
273
{
284
- ThreadedMainloopSignal ( ); // just signal any waiting code, it can look up the details.
274
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 ); // just signal any waiting code, it can look up the details.
285
275
}
286
276
287
277
/* This function assume you are holding `mainloop`'s lock. The operation is unref'd in here, assuming
@@ -323,7 +313,7 @@ static void DisconnectFromPulseServer(void)
323
313
324
314
static void PulseContextStateChangeCallback (pa_context * context , void * userdata )
325
315
{
326
- ThreadedMainloopSignal ( ); // just signal any waiting code, it can look up the details.
316
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 ); // just signal any waiting code, it can look up the details.
327
317
}
328
318
329
319
static bool ConnectToPulseServer (void )
@@ -410,7 +400,7 @@ static void WriteCallback(pa_stream *p, size_t nbytes, void *userdata)
410
400
struct SDL_PrivateAudioData * h = (struct SDL_PrivateAudioData * )userdata ;
411
401
//SDL_Log("PULSEAUDIO WRITE CALLBACK! nbytes=%u", (unsigned int) nbytes);
412
402
h -> bytes_requested += nbytes ;
413
- ThreadedMainloopSignal ( );
403
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 );
414
404
}
415
405
416
406
// This function waits until it is possible to write a full sound buffer
@@ -481,7 +471,7 @@ static Uint8 *PULSEAUDIO_GetDeviceBuf(SDL_AudioDevice *device, int *buffer_size)
481
471
static void ReadCallback (pa_stream * p , size_t nbytes , void * userdata )
482
472
{
483
473
//SDL_Log("PULSEAUDIO READ CALLBACK! nbytes=%u", (unsigned int) nbytes);
484
- ThreadedMainloopSignal ( ); // the recording code queries what it needs, we just need to signal to end any wait
474
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 ); // the recording code queries what it needs, we just need to signal to end any wait
485
475
}
486
476
487
477
static bool PULSEAUDIO_WaitRecordingDevice (SDL_AudioDevice * device )
@@ -602,7 +592,7 @@ static void PULSEAUDIO_CloseDevice(SDL_AudioDevice *device)
602
592
603
593
static void PulseStreamStateChangeCallback (pa_stream * stream , void * userdata )
604
594
{
605
- ThreadedMainloopSignal ( ); // just signal any waiting code, it can look up the details.
595
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 ); // just signal any waiting code, it can look up the details.
606
596
}
607
597
608
598
static bool PULSEAUDIO_OpenDevice (SDL_AudioDevice * device )
@@ -803,7 +793,7 @@ static void SinkInfoCallback(pa_context *c, const pa_sink_info *i, int is_last,
803
793
if (i ) {
804
794
AddPulseAudioDevice (false, i -> description , i -> name , i -> index , & i -> sample_spec );
805
795
}
806
- ThreadedMainloopSignal ( );
796
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 );
807
797
}
808
798
809
799
// This is called when PulseAudio adds a recording ("source") device.
@@ -813,7 +803,7 @@ static void SourceInfoCallback(pa_context *c, const pa_source_info *i, int is_la
813
803
if (i && (include_monitors || (i -> monitor_of_sink == PA_INVALID_INDEX ))) {
814
804
AddPulseAudioDevice (true, i -> description , i -> name , i -> index , & i -> sample_spec );
815
805
}
816
- ThreadedMainloopSignal ( );
806
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 );
817
807
}
818
808
819
809
static void ServerInfoCallback (pa_context * c , const pa_server_info * i , void * data )
@@ -838,7 +828,7 @@ static void ServerInfoCallback(pa_context *c, const pa_server_info *i, void *dat
838
828
}
839
829
}
840
830
841
- ThreadedMainloopSignal ( );
831
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 );
842
832
}
843
833
844
834
static bool FindAudioDeviceByIndex (SDL_AudioDevice * device , void * userdata )
@@ -882,7 +872,7 @@ static void HotplugCallback(pa_context *c, pa_subscription_event_type_t t, uint3
882
872
SDL_AudioDeviceDisconnected (SDL_FindPhysicalAudioDeviceByCallback (FindAudioDeviceByIndex , (void * )(uintptr_t )idx ));
883
873
}
884
874
}
885
- ThreadedMainloopSignal ( );
875
+ PULSEAUDIO_pa_threaded_mainloop_signal ( pulseaudio_threaded_mainloop , 0 );
886
876
}
887
877
888
878
static bool CheckDefaultDevice (const bool changed , char * device_path )
0 commit comments