Mercurial > audlegacy-plugins
changeset 1355:0428dcce1d45
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | William Pitcock <nenolod@atheme-project.org> |
|---|---|
| date | Mon, 23 Jul 2007 17:55:01 -0500 |
| parents | b670d1f3c2e4 (diff) 1e36cc6c4b23 (current diff) |
| children | 996430ebc1c8 |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modplug/modplugbmp.cxx Tue Jul 24 01:46:09 2007 +0300 +++ b/src/modplug/modplugbmp.cxx Mon Jul 23 17:55:01 2007 -0500 @@ -221,12 +221,6 @@ return false; } -void* ModplugXMMS::PlayThread(void* arg) -{ - ((ModplugXMMS*)arg)->PlayLoop(); - return NULL; -} - void ModplugXMMS::PlayLoop() { uint32 lLength; @@ -316,8 +310,6 @@ mPaused = false; mStopped = true; - - g_thread_exit(NULL); } void ModplugXMMS::PlayFile(const string& aFilename) @@ -453,12 +445,8 @@ mModProps.mChannels ); - mDecodeThread = g_thread_create( - (GThreadFunc)PlayThread, - this, - TRUE, - NULL - ); + mDecodeThread = g_thread_self(); + this->PlayLoop(); } void ModplugXMMS::Stop(void)
--- a/src/sexypsf/plugin.c Tue Jul 24 01:46:09 2007 +0300 +++ b/src/sexypsf/plugin.c Mon Jul 23 17:55:01 2007 -0500 @@ -53,7 +53,6 @@ return 0; } - void sexypsf_update(unsigned char *buffer, long count) { const int mask = ~((((16 / 8) * 2)) - 1); @@ -157,8 +156,8 @@ g_free(name); playing = 1; - dethread = g_thread_create((GThreadFunc)sexypsf_playloop, - NULL, TRUE, NULL); + dethread = g_thread_self(); + sexypsf_playloop(NULL); } }
--- a/src/vorbis/vorbis.c Tue Jul 24 01:46:09 2007 +0300 +++ b/src/vorbis/vorbis.c Mon Jul 23 17:55:01 2007 -0500 @@ -583,7 +583,8 @@ playback->eof = 0; playback->error = FALSE; - thread = g_thread_create(vorbis_play_loop, playback, TRUE, NULL); + thread = g_thread_self(); + vorbis_play_loop(playback); } static void
--- a/src/wavpack/libwavpack.cxx Tue Jul 24 01:46:09 2007 +0300 +++ b/src/wavpack/libwavpack.cxx Mon Jul 23 17:55:01 2007 -0500 @@ -349,7 +349,8 @@ isSeek = -1; killDecodeThread = false; AudioError = false; - thread_handle = g_thread_create(DecodeThread, (void *) data->filename, TRUE, NULL); + thread_handle = g_thread_self(); + DecodeThread((void *) data->filename); return; }