playlist file / directory error handling fixes, resize playlist refresh fix

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1342 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2010-07-29 01:46:44 +00:00
parent ebfb4bb75c
commit e2ee27efd4
8 changed files with 39 additions and 26 deletions

View File

@ -296,9 +296,7 @@ void QPulseAudioThread::pulseQuit ( int ret )
{
assert ( mainloop_api );
mainloop_api->quit ( mainloop_api, ret );
if (*s_qprojectM_MainWindowPtr)
delete(*s_qprojectM_MainWindowPtr);
*s_qprojectM_MainWindowPtr = 0;
}
@ -315,7 +313,8 @@ void QPulseAudioThread::stream_read_callback ( pa_stream *s, size_t length, void
{
fprintf ( stderr, "pa_stream_peek() failed: %s\n", pa_strerror ( pa_context_errno ( context ) ) );
pulseQuit ( 1 );
return;
return
;
}
if ((!s_qprojectM_MainWindowPtr) || (!*s_qprojectM_MainWindowPtr))
@ -352,16 +351,16 @@ void QPulseAudioThread::stream_state_callback ( pa_stream *s, void *userdata )
switch ( pa_stream_get_state ( s ) )
{
case PA_STREAM_UNCONNECTED:
// qDebug() << "UNCONNECTED";
qDebug() << "UNCONNECTED";
break;
case PA_STREAM_CREATING:
// qDebug() << "CREATED";
qDebug() << "CREATED";
break;
case PA_STREAM_TERMINATED:
// qDebug() << "TERMINATED";
qDebug() << "TERMINATED";
break;
case PA_STREAM_READY:
// qDebug() << "READY";
qDebug() << "READY";
if ( verbose )
{
const pa_buffer_attr *a;