Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7286/src/common
Modified Files:
tcOggStreamer.cpp tcSound.cpp
Log Message:
multiplayer work
Index: tcOggStreamer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOggStreamer.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcOggStreamer.cpp 25 Mar 2005 03:48:07 -0000 1.17
--- tcOggStreamer.cpp 8 Apr 2005 01:54:11 -0000 1.18
***************
*** 165,170 ****
--- 165,173 ----
source->play();
+
+ fprintf(stdout, "Starting new audio stream: %s\n", queuedSong.c_str());
queuedSong = "";
initializingStream = true;
+
}
}
Index: tcSound.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tcSound.cpp 6 Apr 2005 02:19:48 -0000 1.30
--- tcSound.cpp 8 Apr 2005 01:54:11 -0000 1.31
***************
*** 32,35 ****
--- 32,36 ----
#include "tcSound.h"
#include "tcOggStreamer.h"
+ #include "tcOptions.h"
#include <stdlib.h>
#include <stdio.h>
***************
*** 278,282 ****
}
// bool isPlaying = oggStreamer->IsPlaying();
! if (!oggStreamer->IsSongQueued())
{
QueueRandomMusic();
--- 279,283 ----
}
// bool isPlaying = oggStreamer->IsPlaying();
! if (!oggStreamer->IsSongQueued() && (tcOptions::Get()->mbPlayMusic))
{
QueueRandomMusic();
|
