mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-10 17:35:24 +00:00
Code Issues Projects Releases Wiki Activity

shuffle button config option

Browse Source 
menu / full screen states are now preserved
90% done with new playlist loading framework
broke reset button even more



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@861 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-03-01 05:37:27 +00:00
parent 316d1a5a46
commit b6100f891c
14 changed files with 373 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qprojectM-pulseaudio/QPulseAudioThread.cpp
View File

@ -252,15 +252,18 @@ case PA_STREAM_TERMINATED:// The stream has been terminated cleanly.
}
void QPulseAudioThread::pa_stream_success_callback(pa_stream *s, int success, void *userdata) {
void QPulseAudioThread::pa_stream_success_callback(pa_stream *s, int success, void * data) {
static bool pausedFlag = true;
if (pausedFlag)
qDebug() << "pause";
else
else {
qDebug() << "play";
s_audioMutex.unlock();
qDebug() << "UNLOCK: success callback";
}
pausedFlag = !pausedFlag;
@ -270,14 +273,13 @@ void QPulseAudioThread::pa_stream_success_callback(pa_stream *s, int success, vo
QMutex * QPulseAudioThread::mutex() {
return &s_audioMutex;
return &s_audioMutex;
}
void QPulseAudioThread::cork()
{
int b = 0;
//s_audioMutex.lock();
pa_operation* op =
pa_stream_cork(stream, b, pa_stream_success_callback, this);
@ -453,6 +455,7 @@ void QPulseAudioThread::stdout_callback ( pa_mainloop_api*a, pa_io_event *e, int
{
//int * int_buf = (int *) buffer;
//qDebug() << "LOCK: add pcm";
s_audioMutex.lock();
QProjectM ** prjmPtr = static_cast<QProjectM **> ( userdata );
QProjectM * prjm = *prjmPtr;
@ -464,7 +467,7 @@ void QPulseAudioThread::stdout_callback ( pa_mainloop_api*a, pa_io_event *e, int
prjm->pcm()->addPCMfloat
( buffer+buffer_index, buffer_length / ( sizeof ( float ) ) );
s_audioMutex.unlock();
//qDebug() << "UNLOCK: add pcm";
assert ( buffer_length );
pa_xfree ( buffer );