summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp16
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp33
-rw-r--r--core/multimedia/opieplayer/loopcontrol.cpp24
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.cpp578
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp6
-rw-r--r--core/multimedia/opieplayer/mediaplayerstate.cpp2
-rw-r--r--core/multimedia/opieplayer/om3u.cpp60
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp2
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp1300
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp16
10 files changed, 1006 insertions, 1031 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 73e41dc..d01d2ba 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -148,5 +148,5 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
- qDebug("creating new audio device");
+ // qDebug("creating new audio device");
// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
d = new AudioDevicePrivate;
@@ -154,10 +154,10 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
d->channels = chs;
d->bytesPerSample = bps;
- qDebug("%d",bps);
+ // qDebug("%d",bps);
int format=0;
if( bps == 8) format = AFMT_U8;
else if( bps <= 0) format = AFMT_S16_LE;
else format = AFMT_S16_LE;
- qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
+ // qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
@@ -192,8 +192,8 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
- qDebug("freq %d", d->frequency);
+ // qDebug("freq %d", d->frequency);
if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1)
perror("ioctl(\"SNDCTL_DSP_SPEED\")");
- qDebug("channels %d",d->channels);
+ // qDebug("channels %d",d->channels);
if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) {
d->channels = ( d->channels == 1 ) ? 2 : d->channels;
@@ -219,5 +219,5 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
AudioDevice::~AudioDevice() {
- qDebug("destryo audiodevice");
+ // qDebug("destryo audiodevice");
// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
@@ -243,5 +243,5 @@ void AudioDevice::write( char *buffer, unsigned int length )
if ( t<0 ) t = 0;
if ( t != (int)length) {
- qDebug("Ahhh!! memcpys 1");
+ // qDebug("Ahhh!! memcpys 1");
memcpy(d->unwrittenBuffer,buffer+t,length-t);
d->unwritten = length-t;
@@ -306,5 +306,5 @@ int AudioDevice::bytesWritten() {
int buffered = 0;
if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
- qDebug( "failed to get audio device position" );
+ // qDebug( "failed to get audio device position" );
return -1;
}
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index a1973e9..b187cb4 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -77,5 +77,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
{
setCaption( tr("OpiePlayer") );
- qDebug("<<<<<audioWidget");
+ // qDebug("<<<<<audioWidget");
Config cfg("OpiePlayer");
@@ -91,5 +91,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
skinPath = "opieplayer2/skins/default";
- qDebug("skin path " + skinPath);
+ // qDebug("skin path " + skinPath);
pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
@@ -161,20 +161,21 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
// setPaused( mediaPlayerState->paused() );
setPlaying( mediaPlayerState->playing() );
-
+this->setFocus();
}
AudioWidget::~AudioWidget() {
+ // setPlaying( false);
for ( int i = 0; i < 10; i++ ) {
- delete buttonPixUp[i];
- delete buttonPixDown[i];
+ if(buttonPixUp[i]) delete buttonPixUp[i];
+ if(buttonPixDown[i]) delete buttonPixDown[i];
}
- delete pixBg;
- delete imgUp;
- delete imgDn;
- delete imgButtonMask;
+ if(pixBg) delete pixBg;
+ if(imgUp) delete imgUp;
+ if(imgDn) delete imgDn;
+ if(imgButtonMask) delete imgButtonMask;
for ( int i = 0; i < 10; i++ ) {
- delete masks[i];
+ if(masks[i]) delete masks[i];
}
}
@@ -280,4 +281,5 @@ void AudioWidget::setView( char view ) {
hide();
}
+
}
@@ -291,5 +293,6 @@ static QString timeAsString( long length ) {
void AudioWidget::updateSlider( long i, long max ) {
- time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
+this->setFocus();
+ time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
if ( max == 0 )
@@ -358,6 +361,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
&& y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 );
- if ( isOnButton && i == AudioVolumeUp )
- qDebug("on up");
+// if ( isOnButton && i == AudioVolumeUp )
+// qDebug("on up");
if ( isOnButton && !audioButtons[i].isHeld ) {
@@ -366,9 +369,9 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
switch (i) {
case AudioVolumeUp:
- qDebug("more clicked");
+ // qDebug("more clicked");
emit moreClicked();
return;
case AudioVolumeDown:
- qDebug("less clicked");
+ // qDebug("less clicked");
emit lessClicked();
return;
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 8cf0a75..82242a3 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -101,5 +101,5 @@ LoopControl::LoopControl( QObject *parent, const char *name )
isMuted = FALSE;
connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) );
-qDebug("starting loopcontrol");
+ //qDebug("starting loopcontrol");
audioMutex = new Mutex;
@@ -113,10 +113,10 @@ qDebug("starting loopcontrol");
pthread_attr_setschedparam(&audio_attr,&params);
} else {
- qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
+ // qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
pthread_attr_destroy(&audio_attr);
pthread_attr_init(&audio_attr);
}
#endif
-qDebug("create audio thread");
+ //qDebug("create audio thread");
pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
}
@@ -228,6 +228,6 @@ void LoopControl::startAudio() {
currentSample = audioSampleCounter + 1;
- if ( currentSample != audioSampleCounter + 1 )
- qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+// if ( currentSample != audioSampleCounter + 1 )
+// qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
long samplesRead = 0;
@@ -242,5 +242,5 @@ void LoopControl::startAudio() {
}
else if ( sampleWaitTime <= -5000 ) {
- qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+ // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
// //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
currentSample = sampleWeShouldBeAt;
@@ -362,5 +362,5 @@ bool LoopControl::init( const QString& filename ) {
current_frame = total_video_frames = total_audio_samples = 0;
- qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
+ // qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
// ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
@@ -388,5 +388,5 @@ bool LoopControl::init( const QString& filename ) {
channels = mediaPlayerState->curDecoder()->audioChannels( astream );
- qDebug( "LC- channels = %d", channels );
+ // qDebug( "LC- channels = %d", channels );
// if ( !total_audio_samples )
@@ -394,9 +394,9 @@ bool LoopControl::init( const QString& filename ) {
total_audio_samples += 1000;
- qDebug("total samples %d", total_audio_samples);
+ // qDebug("total samples %d", total_audio_samples);
mediaPlayerState->setLength( total_audio_samples );
freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
- qDebug( "LC- frequency = %d", freq );
+ // qDebug( "LC- frequency = %d", freq );
audioSampleCounter = 0;
@@ -404,5 +404,5 @@ bool LoopControl::init( const QString& filename ) {
if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
- qDebug("using stupid hack");
+ // qDebug("using stupid hack");
} else {
bits_per_sample=0;
@@ -452,5 +452,5 @@ bool LoopControl::init( const QString& filename ) {
void LoopControl::play() {
- qDebug("LC- play");
+ // qDebug("LC- play");
mediaPlayerState->setPosition( 0); //uglyhack
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index e99c97b..364e77b 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -53,12 +53,12 @@ extern MediaPlayerState *mediaPlayerState;
-static char *audioBuffer = NULL;
+static char *audioBuffer = NULL;
static AudioDevice *audioDevice = NULL;
-static bool disabledSuspendScreenSaver = FALSE;
+static bool disabledSuspendScreenSaver = FALSE;
-pthread_t video_tid;
+pthread_t video_tid;
pthread_attr_t video_attr;
-pthread_t audio_tid;
+pthread_t audio_tid;
pthread_attr_t audio_attr;
@@ -71,31 +71,31 @@ class Mutex {
public:
Mutex() {
- pthread_mutexattr_t attr;
- pthread_mutexattr_init( &attr );
- pthread_mutex_init( &mutex, &attr );
- pthread_mutexattr_destroy( &attr );
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init( &attr );
+ pthread_mutex_init( &mutex, &attr );
+ pthread_mutexattr_destroy( &attr );
}
~Mutex() {
- pthread_mutex_destroy( &mutex );
+ pthread_mutex_destroy( &mutex );
}
void lock() {
- pthread_mutex_lock( &mutex );
+ pthread_mutex_lock( &mutex );
}
void unlock() {
- pthread_mutex_unlock( &mutex );
+ pthread_mutex_unlock( &mutex );
}
/*
bool locked() {
- switch ( pthread_mutex_trylock( &mutex ) ) {
- case EBUSY:
- return TRUE;
- case 0:
- pthread_mutex_unlock( &mutex );
- default:
- return FALSE;
- }
+ switch ( pthread_mutex_trylock( &mutex ) ) {
+ case EBUSY:
+ return TRUE;
+ case 0:
+ pthread_mutex_unlock( &mutex );
+ default:
+ return FALSE;
+ }
}
*/
@@ -109,11 +109,11 @@ public:
currentFrameObj() : value( 0 ) { }
void set( long f ) {
- mutex.lock();
- value = f;
- mediaPlayerState->curDecoder()->videoSetFrame( f, 0 );
- mutex.unlock();
+ mutex.lock();
+ value = f;
+ mediaPlayerState->curDecoder()->videoSetFrame( f, 0 );
+ mutex.unlock();
}
long get() {
- return value;
+ return value;
}
private:
@@ -128,5 +128,5 @@ Mutex *globalMutex;
-clock_t begin;
+clock_t begin;
@@ -159,5 +159,5 @@ void LoopControl::timerEvent( QTimerEvent* ) {
// playFinished will eventually call stop() which stops these threads.
if ( emitPlayFinished ) {
- emitPlayFinished = FALSE;
+ emitPlayFinished = FALSE;
mediaPlayerState->setPlaying( FALSE );
}
@@ -165,16 +165,16 @@ void LoopControl::timerEvent( QTimerEvent* ) {
if ( emitChangePos ) {
- emitChangePos = FALSE;
+ emitChangePos = FALSE;
- if ( hasVideoChannel && hasAudioChannel ) {
- sendingNewPos = TRUE;
- mediaPlayerState->setPosition( current_frame );
- } else if ( hasVideoChannel ) {
- sendingNewPos = TRUE;
- mediaPlayerState->setPosition( current_frame );
- } else if ( hasAudioChannel ) {
- sendingNewPos = TRUE;
- mediaPlayerState->setPosition( audioSampleCounter );
- }
+ if ( hasVideoChannel && hasAudioChannel ) {
+ sendingNewPos = TRUE;
+ mediaPlayerState->setPosition( current_frame );
+ } else if ( hasVideoChannel ) {
+ sendingNewPos = TRUE;
+ mediaPlayerState->setPosition( current_frame );
+ } else if ( hasAudioChannel ) {
+ sendingNewPos = TRUE;
+ mediaPlayerState->setPosition( audioSampleCounter );
+ }
}
@@ -186,41 +186,41 @@ void LoopControl::timerEvent( QTimerEvent* ) {
void LoopControl::setPosition( long pos ) {
if ( sendingNewPos ) {
- sendingNewPos = FALSE;
- return;
+ sendingNewPos = FALSE;
+ return;
}
if ( hasVideoChannel && hasAudioChannel ) {
- videoMutex->lock();
- audioMutex->lock();
-qDebug("setting position");
- playtime.restart();
- playtime = playtime.addMSecs( -pos * 1000 / framerate );
- //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate;
- current_frame = pos + 1;
- mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
- prev_frame = current_frame - 1;
- currentSample = (int)( current_frame * freq / framerate );
- mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
- audioSampleCounter = currentSample - 1;
- audioMutex->unlock();
- videoMutex->unlock();
+ videoMutex->lock();
+ audioMutex->lock();
+ //qDebug("setting position");
+ playtime.restart();
+ playtime = playtime.addMSecs( -pos * 1000 / framerate );
+ //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate;
+ current_frame = pos + 1;
+ mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+ prev_frame = current_frame - 1;
+ currentSample = (int)( current_frame * freq / framerate );
+ mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
+ audioSampleCounter = currentSample - 1;
+ audioMutex->unlock();
+ videoMutex->unlock();
} else if ( hasVideoChannel ) {
- videoMutex->lock();
- playtime.restart();
- playtime = playtime.addMSecs( -pos * 1000 / framerate );
- //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate;
- current_frame = pos + 1;
- mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
- videoMutex->unlock();
- prev_frame = current_frame - 1;
+ videoMutex->lock();
+ playtime.restart();
+ playtime = playtime.addMSecs( -pos * 1000 / framerate );
+ //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate;
+ current_frame = pos + 1;
+ mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+ videoMutex->unlock();
+ prev_frame = current_frame - 1;
} else if ( hasAudioChannel ) {
- audioMutex->lock();
- playtime.restart();
- playtime = playtime.addMSecs( -pos * 1000 / freq );
- //begin = clock() - (double)pos * CLOCKS_PER_SEC / freq;
- currentSample = pos + 1; // (int)( current_frame * freq / framerate );
- mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
- audioSampleCounter = currentSample - 1;
- audioMutex->unlock();
+ audioMutex->lock();
+ playtime.restart();
+ playtime = playtime.addMSecs( -pos * 1000 / freq );
+ //begin = clock() - (double)pos * CLOCKS_PER_SEC / freq;
+ currentSample = pos + 1; // (int)( current_frame * freq / framerate );
+ mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
+ audioSampleCounter = currentSample - 1;
+ audioMutex->unlock();
}
}
@@ -246,83 +246,83 @@ void LoopControl::startVideo() {
if ( mediaPlayerState->curDecoder() && hasVideoChannel ) {
- if ( hasAudioChannel && !isMuted ) {
+ if ( hasAudioChannel && !isMuted ) {
- bool done = FALSE;
+ bool done = FALSE;
- do {
+ do {
/*
- videoMutex->lock();
- current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
- //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
-
- // Sync to Audio
-// current_frame = (long)((double)(audioSampleCounter - 1000) * framerate / (double)freq);
-
- long mSecsToNextFrame = 0;
-
- if ( current_frame == prev_frame ) {
- int nf = current_frame + 1;
- if ( nf > 0 && nf != total_video_frames )
- // mSecsToNextFrame = long(double(nf * CLOCKS_PER_SEC) / framerate) - ( clock() - begin );
- mSecsToNextFrame = long(double(nf * 1000) / framerate) - ( playtime.elapsed() );
- }
- videoMutex->unlock();
-
- if ( mSecsToNextFrame ) {
- usleep( mSecsToNextFrame ); // wait a bit
-
- videoMutex->lock();
- // This should now be the next frame
- current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
- //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
- videoMutex->unlock();
- }
-
- videoMutex->lock();
- done = current_frame >= prev_frame;
- videoMutex->unlock();
+ videoMutex->lock();
+ current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
+ //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
+
+ // Sync to Audio
+// current_frame = (long)((double)(audioSampleCounter - 1000) * framerate / (double)freq);
+
+ long mSecsToNextFrame = 0;
+
+ if ( current_frame == prev_frame ) {
+ int nf = current_frame + 1;
+ if ( nf > 0 && nf != total_video_frames )
+ // mSecsToNextFrame = long(double(nf * CLOCKS_PER_SEC) / framerate) - ( clock() - begin );
+ mSecsToNextFrame = long(double(nf * 1000) / framerate) - ( playtime.elapsed() );
+ }
+ videoMutex->unlock();
+
+ if ( mSecsToNextFrame ) {
+ usleep( mSecsToNextFrame ); // wait a bit
+
+ videoMutex->lock();
+ // This should now be the next frame
+ current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
+ //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
+ videoMutex->unlock();
+ }
+
+ videoMutex->lock();
+ done = current_frame >= prev_frame;
+ videoMutex->unlock();
*/
- videoMutex->lock();
- current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
- done = current_frame >= prev_frame;
- videoMutex->unlock();
- if ( !done )
- usleep( 1000 ); // wait a bit
-
- } while ( !done );
-
-// qDebug("elapsed: %i %i (%f)", int( playtime.elapsed() ), current_frame, framerate );
-
- } else {
- videoMutex->lock();
- current_frame++;
- videoMutex->unlock();
- }
-
- videoMutex->lock();
- bool check = current_frame && current_frame > prev_frame;
- videoMutex->unlock();
-
- if ( check ) {
- videoMutex->lock();
- if ( current_frame > prev_frame + 1 ) {
- qDebug("skipped a frame");
- mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
- }
- prev_frame = current_frame;
- if ( moreVideo = videoUI->playVideo() )
- emitChangePos = TRUE;
- videoMutex->unlock();
- }
-
- } else
- moreVideo = FALSE;
+ videoMutex->lock();
+ current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
+ done = current_frame >= prev_frame;
+ videoMutex->unlock();
+ if ( !done )
+ usleep( 1000 ); // wait a bit
+
+ } while ( !done );
+
+// qDebug("elapsed: %i %i (%f)", int( playtime.elapsed() ), current_frame, framerate );
+
+ } else {
+ videoMutex->lock();
+ current_frame++;
+ videoMutex->unlock();
+ }
+
+ videoMutex->lock();
+ bool check = current_frame && current_frame > prev_frame;
+ videoMutex->unlock();
+
+ if ( check ) {
+ videoMutex->lock();
+ if ( current_frame > prev_frame + 1 ) {
+ // qDebug("skipped a frame");
+ mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
+ }
+ prev_frame = current_frame;
+ if ( moreVideo = videoUI->playVideo() )
+ emitChangePos = TRUE;
+ videoMutex->unlock();
+ }
+
+ } else
+ moreVideo = FALSE;
}
if ( !moreVideo && !moreAudio )
- emitPlayFinished = TRUE;
+ emitPlayFinished = TRUE;
pthread_exit(NULL);
@@ -334,77 +334,77 @@ void LoopControl::startAudio() {
while ( moreAudio ) {
- if ( !isMuted && mediaPlayerState->curDecoder() && hasAudioChannel ) {
+ if ( !isMuted && mediaPlayerState->curDecoder() && hasAudioChannel ) {
- audioMutex->lock();
- currentSample = mediaPlayerState->curDecoder()->audioGetSample( stream );
+ audioMutex->lock();
+ currentSample = mediaPlayerState->curDecoder()->audioGetSample( stream );
- if ( currentSample == 0 )
- currentSample = audioSampleCounter + 1;
+ if ( currentSample == 0 )
+ currentSample = audioSampleCounter + 1;
- if ( currentSample != audioSampleCounter + 1 )
- qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
- audioMutex->unlock();
+// if ( currentSample != audioSampleCounter + 1 )
+// qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+ audioMutex->unlock();
/*
- int sampleWeShouldBeAt = int( playtime.elapsed() ) * freq / 1000;
+ int sampleWeShouldBeAt = int( playtime.elapsed() ) * freq / 1000;
- if ( sampleWeShouldBeAt - currentSample > 20000 ) {
- mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
- currentSample = sampleWeShouldBeAt;
- }
+ if ( sampleWeShouldBeAt - currentSample > 20000 ) {
+ mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+ currentSample = sampleWeShouldBeAt;
+ }
*/
- long samplesRead = 0;
-
- const long samples = 1024;
-
- moreAudio = !mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, samples, samplesRead, stream );
-
- audioMutex->lock();
- long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
- //long sampleWeShouldBeAt = long( clock() - begin ) * (double) freq / CLOCKS_PER_SEC;
- long sampleWaitTime = currentSample - sampleWeShouldBeAt;
- audioMutex->unlock();
-
- if ( sampleWaitTime >= 0 && sampleWaitTime <= 2000 ) {
- //qDebug("sampleWaitTime: %i", sampleWaitTime);
- usleep( ( sampleWaitTime * 1000000 ) / ( freq ) );
- } else {
- audioMutex->lock();
- if ( sampleWaitTime <= -2000 ) {
- qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
- mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
- currentSample = sampleWeShouldBeAt;
- }
- audioMutex->unlock();
- }
+ long samplesRead = 0;
+
+ const long samples = 1024;
+
+ moreAudio = !mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, samples, samplesRead, stream );
+
+ audioMutex->lock();
+ long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
+ //long sampleWeShouldBeAt = long( clock() - begin ) * (double) freq / CLOCKS_PER_SEC;
+ long sampleWaitTime = currentSample - sampleWeShouldBeAt;
+ audioMutex->unlock();
+
+ if ( sampleWaitTime >= 0 && sampleWaitTime <= 2000 ) {
+ //qDebug("sampleWaitTime: %i", sampleWaitTime);
+ usleep( ( sampleWaitTime * 1000000 ) / ( freq ) );
+ } else {
+ audioMutex->lock();
+ if ( sampleWaitTime <= -2000 ) {
+ // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+ mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+ currentSample = sampleWeShouldBeAt;
+ }
+ audioMutex->unlock();
+ }
- audioDevice->write( audioBuffer, samplesRead * 2 * channels );
+ audioDevice->write( audioBuffer, samplesRead * 2 * channels );
- audioMutex->lock();
-// audioSampleCounter += samplesRead;
- audioSampleCounter = currentSample + samplesRead - 1;
- audioMutex->unlock();
+ audioMutex->lock();
+// audioSampleCounter += samplesRead;
+ audioSampleCounter = currentSample + samplesRead - 1;
+ audioMutex->unlock();
- if ( !hasVideoChannel )
- emitChangePos = TRUE;
+ if ( !hasVideoChannel )
+ emitChangePos = TRUE;
- //qDebug("currentSample: %i audioSampleCounter: %i total_audio_samples: %i", currentSample, audioSampleCounter, total_audio_samples);
-// qDebug("current: %i counter: %i total: %i", currentSample, audioSampleCounter, (int)total_audio_samples);
- moreAudio = audioSampleCounter <= total_audio_samples;
+ //qDebug("currentSample: %i audioSampleCounter: %i total_audio_samples: %i", currentSample, audioSampleCounter, total_audio_samples);
+// qDebug("current: %i counter: %i total: %i", currentSample, audioSampleCounter, (int)total_audio_samples);
+ moreAudio = audioSampleCounter <= total_audio_samples;
- } else {
+ } else {
- if ( mediaPlayerState->curDecoder() && hasAudioChannel )
- usleep( 100000 ); // Check every 1/10 sec to see if mute is off
- else
- moreAudio = FALSE;
+ if ( mediaPlayerState->curDecoder() && hasAudioChannel )
+ usleep( 100000 ); // Check every 1/10 sec to see if mute is off
+ else
+ moreAudio = FALSE;
- }
+ }
}
- qDebug( "End of file" );
+ // qDebug( "End of file" );
if ( !moreVideo && !moreAudio )
- emitPlayFinished = TRUE;
+ emitPlayFinished = TRUE;
pthread_exit(NULL);
@@ -413,22 +413,22 @@ void LoopControl::startAudio() {
void LoopControl::killTimers() {
if ( hasVideoChannel ) {
- if ( pthread_self() != video_tid ) {
- if ( pthread_cancel(video_tid) == 0 ) {
- void *thread_result = 0;
- if ( pthread_join(video_tid,&thread_result) != 0 )
- qDebug("thread join error 1");
- pthread_attr_destroy(&video_attr);
- }
- }
+ if ( pthread_self() != video_tid ) {
+ if ( pthread_cancel(video_tid) == 0 ) {
+ void *thread_result = 0;
+ if ( pthread_join(video_tid,&thread_result) != 0 )
+ // qDebug("thread join error 1");
+ pthread_attr_destroy(&video_attr);
+ }
+ }
}
if ( hasAudioChannel ) {
- if ( pthread_self() != audio_tid ) {
- if ( pthread_cancel(audio_tid) == 0 ) {
- void *thread_result = 0;
- if ( pthread_join(audio_tid,&thread_result) != 0 )
- qDebug("thread join error 2");
- pthread_attr_destroy(&audio_attr);
- }
- }
+ if ( pthread_self() != audio_tid ) {
+ if ( pthread_cancel(audio_tid) == 0 ) {
+ void *thread_result = 0;
+ if ( pthread_join(audio_tid,&thread_result) != 0 )
+ // qDebug("thread join error 2");
+ pthread_attr_destroy(&audio_attr);
+ }
+ }
}
}
@@ -439,20 +439,20 @@ void LoopControl::startTimers() {
if ( hasVideoChannel ) {
- moreVideo = TRUE;
- pthread_attr_init(&video_attr);
- pthread_create(&video_tid, &video_attr, (void * (*)(void *))startVideoThread, this);
+ moreVideo = TRUE;
+ pthread_attr_init(&video_attr);
+ pthread_create(&video_tid, &video_attr, (void * (*)(void *))startVideoThread, this);
}
if ( hasAudioChannel ) {
- moreAudio = TRUE;
- pthread_attr_init(&audio_attr);
+ moreAudio = TRUE;
+ pthread_attr_init(&audio_attr);
#ifdef USE_REALTIME_AUDIO_THREAD
- pthread_attr_setschedpolicy(&audio_attr,SCHED_RR); // Real-time round robin
- //qDebug("min: %i, max: %i", sched_get_priority_min( SCHED_RR ), sched_get_priority_max( SCHED_RR ) );
- sched_param params;
- params.sched_priority = 50;
- pthread_attr_setschedparam(&audio_attr,&params);
+ pthread_attr_setschedpolicy(&audio_attr,SCHED_RR); // Real-time round robin
+ //qDebug("min: %i, max: %i", sched_get_priority_min( SCHED_RR ), sched_get_priority_max( SCHED_RR ) );
+ sched_param params;
+ params.sched_priority = 50;
+ pthread_attr_setschedparam(&audio_attr,&params);
#endif
- pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
+ pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
}
}
@@ -465,16 +465,16 @@ void LoopControl::setPaused( bool pause ) {
if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() )
- return;
+ return;
if ( pause ) {
- // Remember where we are
- whenPaused = playtime.elapsed();
- killTimers();
+ // Remember where we are
+ whenPaused = playtime.elapsed();
+ killTimers();
} else {
- // Just like we never stopped
- playtime.restart();
- playtime = playtime.addMSecs( -whenPaused );
- whenPaused = 0;
- startTimers();
+ // Just like we never stopped
+ playtime.restart();
+ playtime = playtime.addMSecs( -whenPaused );
+ whenPaused = 0;
+ startTimers();
}
}
@@ -485,7 +485,7 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
- disabledSuspendScreenSaver = FALSE;
- // Re-enable the suspend mode
- QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+ disabledSuspendScreenSaver = FALSE;
+ // Re-enable the suspend mode
+ QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
}
#endif
@@ -493,14 +493,14 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) {
- killTimers();
+ killTimers();
- mediaPlayerState->curDecoder()->close();
+ mediaPlayerState->curDecoder()->close();
- if ( audioDevice ) {
- delete audioDevice;
- delete audioBuffer;
- audioDevice = 0;
- audioBuffer = 0;
- }
+ if ( audioDevice ) {
+ delete audioDevice;
+ delete audioBuffer;
+ audioDevice = 0;
+ audioBuffer = 0;
+ }
}
@@ -514,16 +514,16 @@ bool LoopControl::init( const QString& filename ) {
current_frame = total_video_frames = total_audio_samples = 0;
- qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
+ // qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
// ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
- if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
- total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
- mediaPlayerState->libMpeg3Decoder()->close();
- }
+ if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
+ total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
+ mediaPlayerState->libMpeg3Decoder()->close();
+ }
}
if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) )
- return FALSE;
+ return FALSE;
hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0;
@@ -531,48 +531,48 @@ bool LoopControl::init( const QString& filename ) {
if ( hasAudioChannel ) {
- int astream = 0;
+ int astream = 0;
- channels = mediaPlayerState->curDecoder()->audioChannels( astream );
- DecodeLoopDebug(( "channels = %d\n", channels ));
-
- if ( !total_audio_samples )
- total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
+ channels = mediaPlayerState->curDecoder()->audioChannels( astream );
+ DecodeLoopDebug(( "channels = %d\n", channels ));
+
+ if ( !total_audio_samples )
+ total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
- mediaPlayerState->setLength( total_audio_samples );
-
- freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
- DecodeLoopDebug(( "frequency = %d\n", freq ));
+ mediaPlayerState->setLength( total_audio_samples );
+
+ freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
+ DecodeLoopDebug(( "frequency = %d\n", freq ));
- audioSampleCounter = 0;
+ audioSampleCounter = 0;
- static const int bytes_per_sample = 2; //16 bit
+ static const int bytes_per_sample = 2; //16 bit
- audioDevice = new AudioDevice( freq, channels, bytes_per_sample );
- audioBuffer = new char[ audioDevice->bufferSize() ];
- channels = audioDevice->channels();
+ audioDevice = new AudioDevice( freq, channels, bytes_per_sample );
+ audioBuffer = new char[ audioDevice->bufferSize() ];
+ channels = audioDevice->channels();
- //### must check which frequency is actually used.
- static const int size = 1;
- short int buf[size];
- long samplesRead = 0;
- mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
+ //### must check which frequency is actually used.
+ static const int size = 1;
+ short int buf[size];
+ long samplesRead = 0;
+ mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
}
if ( hasVideoChannel ) {
- total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
+ total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
- mediaPlayerState->setLength( total_video_frames );
+ mediaPlayerState->setLength( total_video_frames );
- framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
- DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
+ framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
+ DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
- if ( framerate <= 1.0 ) {
- DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
- framerate = 25;
- }
+ if ( framerate <= 1.0 ) {
+ DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
+ framerate = 25;
+ }
- if ( total_video_frames == 1 ) {
- DecodeLoopDebug(( "Cannot seek to frame" ));
- }
+ if ( total_video_frames == 1 ) {
+ DecodeLoopDebug(( "Cannot seek to frame" ));
+ }
}
@@ -595,8 +595,8 @@ void LoopControl::play() {
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( !disabledSuspendScreenSaver ) {
- disabledSuspendScreenSaver = TRUE;
+ disabledSuspendScreenSaver = TRUE;
// Stop the screen from blanking and power saving state
- QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
- << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
+ QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
+ << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
}
#endif
@@ -611,13 +611,13 @@ void LoopControl::play() {
void LoopControl::setMute( bool on ) {
if ( isMuted != on ) {
- isMuted = on;
- if ( isMuted ) {
- } else {
- int frame = current_frame; // mediaPlayerState->curDecoder()->videoGetFrame( stream );
- playtime.restart();
- playtime = playtime.addMSecs( -frame * 1000 / framerate );
- //begin = clock() - (double)frame * CLOCKS_PER_SEC / framerate;
- mediaPlayerState->curDecoder()->audioSetSample( frame*freq/framerate, stream );
- }
+ isMuted = on;
+ if ( isMuted ) {
+ } else {
+ int frame = current_frame; // mediaPlayerState->curDecoder()->videoGetFrame( stream );
+ playtime.restart();
+ playtime = playtime.addMSecs( -frame * 1000 / framerate );
+ //begin = clock() - (double)frame * CLOCKS_PER_SEC / framerate;
+ mediaPlayerState->curDecoder()->audioSetSample( frame*freq/framerate, stream );
+ }
}
}
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 4f3823a..753b2e3 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -81,5 +81,5 @@ void MediaPlayer::play() {
void MediaPlayer::setPlaying( bool play ) {
- qDebug("MediaPlayer setPlaying");
+ // qDebug("MediaPlayer setPlaying %d", play);
if ( !play ) {
mediaPlayerState->setPaused( FALSE );
@@ -92,5 +92,5 @@ void MediaPlayer::setPlaying( bool play ) {
return;
}
- qDebug("about to ctrash");
+ // qDebug("about to ctrash");
const DocLnk *playListCurrent = playList->current();
@@ -257,5 +257,5 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_F12: //home
- qDebug("Blank here");
+ // qDebug("Blank here");
break;
case Key_F13: //mail
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index cf166d6..6823076 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -128,5 +128,5 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
void MediaPlayerState::loadPlugins() {
- qDebug("load plugins");
+ // qDebug("load plugins");
#ifndef QT_NO_COMPONENT
QValueList<MediaPlayerPlugin>::Iterator mit;
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 3541e5f..8b92a8c 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -49,6 +49,6 @@
static inline QString fullBaseName ( const QFileInfo &fi )
{
- QString str = fi. fileName ( );
- return str. left ( str. findRev ( '.' ));
+ QString str = fi. fileName ( );
+ return str. left ( str. findRev ( '.' ));
}
@@ -67,31 +67,31 @@ Om3u::~Om3u(){}
void Om3u::readM3u() {
// qDebug("<<<<<<reading m3u "+f.name());
- QTextStream t(&f);
- QString s;
- while ( !t.atEnd() ) {
- s=t.readLine();
- qDebug(s);
- if( s.find( "#", 0, TRUE) == -1 ) {
- if( s.left(2) == "E:" || s.left(2) == "P:" ) {
- s = s.right( s.length() -2 );
- QFileInfo f( s );
- QString name = fullBaseName ( f );
- name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 );
- s=s.replace( QRegExp( "\\" ), "/" );
- append(s);
-// qDebug(s);
- } else { // is url
- s.replace( QRegExp( "%20" )," " );
- QString name;
-// if( name.left( 4 ) == "http" ) {
-// name = s.right( s.length() - 7 );
-// } else {
- name = s;
-// }
- append(name);
-// qDebug(name);
- }
- }
- }
+ QTextStream t(&f);
+ QString s;
+ while ( !t.atEnd() ) {
+ s=t.readLine();
+ // qDebug(s);
+ if( s.find( "#", 0, TRUE) == -1 ) {
+ if( s.left(2) == "E:" || s.left(2) == "P:" ) {
+ s = s.right( s.length() -2 );
+ QFileInfo f( s );
+ QString name = fullBaseName ( f );
+ name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 );
+ s=s.replace( QRegExp( "\\" ), "/" );
+ append(s);
+ // qDebug(s);
+ } else { // is url
+ s.replace( QRegExp( "%20" )," " );
+ QString name;
+ // if( name.left( 4 ) == "http" ) {
+ // name = s.right( s.length() - 7 );
+ // } else {
+ name = s;
+ // }
+ append(name);
+ // qDebug(name);
+ }
+ }
+ }
}
@@ -136,5 +136,5 @@ void Om3u::write() { //writes list to m3u file
if(count()>0) {
for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
- qDebug(*it);
+ // qDebug(*it);
list += *it+"\n";
}
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 67187f8..94567f2 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -195,5 +195,5 @@ void PlayListSelection::writeCurrent( Config& cfg ) {
if ( item )
cfg.writeEntry("current", item->text(0) );
- qDebug(item->text(0));
+ // qDebug(item->text(0));
}
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 7ea95ab..1fc7dd8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -308,5 +308,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QWidget *LTab;
LTab = new QWidget( tabWidget, "LTab" );
- playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
+ playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE);
QGridLayout *layoutL = new QGridLayout( LTab );
@@ -314,5 +314,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
layoutL->setMargin( 2);
layoutL->addMultiCellWidget( playLists, 0, 0, 0, 1 );
-// playLists->setMinimumSize(233,260);
tabWidget->insertTab(LTab,tr("Lists"));
@@ -359,10 +358,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
Config cfg( "OpiePlayer" );
readConfig( cfg );
- QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
- loadList(DocLnk( currentPlaylist));
- setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist)));
+
+ currentPlayList = cfg.readEntry("CurrentPlaylist","default");
+ loadList(DocLnk( currentPlayList));
+ setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlayList)));
initializeStates();
- // audioUI->setFocus();
}
@@ -422,13 +421,14 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
// the way writing lnks doesn't really check for out
// of disk space, but check it anyway.
- if ( !lnk->writeLink() ) {
- QMessageBox::critical( 0, tr("Out of space"),
- tr( "There was a problem saving "
- "the playlist.\n"
- "Your playlist "
- "may be missing some entries\n"
- "the next time you start it." )
- );
- }
+// if ( !lnk->writeLink() ) {
+// QMessageBox::critical( 0, tr("Out of space"),
+// tr( "There was a problem saving "
+// "the playlist.\n"
+// "Your playlist "
+// "may be missing some entries\n"
+// "the next time you start it." )
+// );
+// }
+
}
noOfFiles++;
@@ -448,10 +448,16 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
else
mediaPlayerState->setPlaying( true);
+
}
void PlayListWidget::clearList() {
- while ( first() )
- d->selectedFiles->removeSelected();
+ while ( first() )
+ d->selectedFiles->removeSelected();
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("PlayList");
+ cfg.writeEntry("CurrentPlaylist","");
+ currentPlayList="";
+
}
@@ -498,55 +504,60 @@ void PlayListWidget::setDocument(const QString& fileref) {
fromSetDocument = true;
d->setDocumentUsed = TRUE;
- d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true );
- mediaPlayerState->setPlaying( FALSE );
- qApp->processEvents();
- mediaPlayerState->setPlaying( TRUE );
+ setDocumentEx(fileref);
}
void PlayListWidget::setDocumentEx(const QString& fileref) {
-
- QFileInfo fileInfo(fileref);
- if ( !fileInfo.exists() ) {
- QMessageBox::critical( 0, tr( "Invalid File" ),
- tr( "There was a problem in getting the file." ) );
- return;
- }
- qDebug("setDocument "+fileref);
- QString extension = fileInfo.extension(false);
- if( extension.find( "m3u", 0, false) != -1) { //is m3u
+ qDebug("opieplayer receive "+fileref);
+ clearList();
+ DocLnk lnk;
+ QFileInfo fileInfo(fileref);
+ if ( !fileInfo.exists() ) {
+ QMessageBox::critical( 0, tr( "Invalid File" ),
+ tr( "There was a problem in getting the file." ) );
+ return;
+ }
+ // qDebug("<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref);
+ QString extension = fileInfo.extension(false);
+ if( extension.find( "m3u", 0, false) != -1) { //is m3u
readm3u( fileref);
- }
- else if( extension.find( "pls", 0, false) != -1 ) { //is pls
- readPls( fileref);
- }
- else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist
- clearList();
- DocLnk lnk;
- lnk.setName( fileInfo.baseName() ); //sets name
- lnk.setFile( fileref ); //sets file name
- //addToSelection( lnk );
-
- loadList( lnk);
- d->selectedFiles->first();
- } else {
- clearList();
- DocLnk lnk;
- lnk.setName( fileInfo.baseName() ); //sets name
- lnk.setFile( fileref ); //sets file name
- addToSelection( lnk );
-// addToSelection( DocLnk( fileref ) );
- d->setDocumentUsed = TRUE;
- mediaPlayerState->setPlaying( FALSE );
- qApp->processEvents();
- mediaPlayerState->setPlaying( TRUE );
- // qApp->processEvents();
- setCaption(tr("OpiePlayer"));
- }
+ }
+ else if( extension.find( "pls", 0, false) != -1 ) { //is pls
+ readPls( fileref);
+ }
+ else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist
+ clearList();
+ lnk.setName( fileInfo.baseName() ); //sets name
+ lnk.setFile( fileref ); //sets file name
+ lnk.setIcon("Sound");
+ //addToSelection( lnk );
+
+ loadList( lnk);
+ d->selectedFiles->first();
+ } else {
+ if( fileref.find(".desktop",0,TRUE) != -1) {
+ lnk = DocLnk(fileref);
+ } else {
+ lnk.setName( fileInfo.baseName() ); //sets name
+ lnk.setFile( fileref ); //sets file name
+ lnk.setIcon("Sound");
+ }
+
+ addToSelection( lnk );
+ // addToSelection( DocLnk( fileref ) );
+ lnk.removeLinkFile();
+ // qApp->processEvents();
+ }
+ setCaption(tr("OpiePlayer"));
+ d->setDocumentUsed = TRUE;
+ d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true );
+ mediaPlayerState->setPlaying( FALSE );
+ qApp->processEvents();
+ mediaPlayerState->setPlaying( TRUE );
+
}
void PlayListWidget::setActiveWindow() {
- qDebug("SETTING active window");
-
+ // qDebug("SETTING active window");
// When we get raised we need to ensure that it switches views
char origView = mediaPlayerState->view();
@@ -562,125 +573,107 @@ void PlayListWidget::useSelectedDocument() {
const DocLnk *PlayListWidget::current() { // this is fugly
-
-// if( fromSetDocument) {
-// qDebug("from setDoc");
-// DocLnkSet files;
-// Global::findDocuments(&files, "video/*;audio/*");
-// QListIterator<DocLnk> dit( files.children() );
-// for ( ; dit.current(); ++dit ) {
-// if(dit.current()->linkFile() == setDocFileRef) {
-// qDebug(setDocFileRef);
-// return dit;
-// }
-// }
-// } else
-
- qDebug("current");
-
- switch (tabWidget->currentPageIndex()) {
- case 0: //playlist
- {
- qDebug("playlist");
- if ( mediaPlayerState->playlist() ) {
- return d->selectedFiles->current();
- }
- else if ( d->setDocumentUsed && d->current ) {
- return d->current;
- } else {
- return &(d->files->selectedDocument());
- }
+ switch (tabWidget->currentPageIndex()) {
+ case 0: //playlist
+ {
+ // qDebug("playlist");
+ if ( mediaPlayerState->playlist() ) {
+ return d->selectedFiles->current();
}
- break;
- case 1://audio
- {
- qDebug("audioView");
- QListIterator<DocLnk> dit( files.children() );
- for ( ; dit.current(); ++dit ) {
- if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
- qDebug("here");
- insanityBool=TRUE;
- return dit;
- }
- }
- }
- break;
- case 2: // video
- {
- qDebug("videoView");
- QListIterator<DocLnk> Vdit( vFiles.children() );
- for ( ; Vdit.current(); ++Vdit ) {
- if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
- insanityBool=TRUE;
- return Vdit;
- }
- }
+ else if ( d->setDocumentUsed && d->current ) {
+ return d->current;
+ } else {
+ return &(d->files->selectedDocument());
}
- break;
- };
- return 0;
+ }
+ break;
+ case 1://audio
+ {
+ // qDebug("audioView");
+ QListIterator<DocLnk> dit( files.children() );
+ for ( ; dit.current(); ++dit ) {
+ if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
+ insanityBool=TRUE;
+ return dit;
+ }
+ }
+ }
+ break;
+ case 2: // video
+ {
+ QListIterator<DocLnk> Vdit( vFiles.children() );
+ for ( ; Vdit.current(); ++Vdit ) {
+ if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
+ insanityBool=TRUE;
+ return Vdit;
+ }
+ }
+ }
+ break;
+ };
+ return 0;
}
bool PlayListWidget::prev() {
- if ( mediaPlayerState->playlist() ) {
- if ( mediaPlayerState->shuffled() ) {
- const DocLnk *cur = current();
- int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
- for ( int i = 0; i < j; i++ ) {
- if ( !d->selectedFiles->next() )
- d->selectedFiles->first();
+ if ( mediaPlayerState->playlist() ) {
+ if ( mediaPlayerState->shuffled() ) {
+ const DocLnk *cur = current();
+ int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
+ for ( int i = 0; i < j; i++ ) {
+ if ( !d->selectedFiles->next() )
+ d->selectedFiles->first();
+ }
+ if ( cur == current() )
+ if ( !d->selectedFiles->next() )
+ d->selectedFiles->first();
+ return TRUE;
+ } else {
+ if ( !d->selectedFiles->prev() ) {
+ if ( mediaPlayerState->looping() ) {
+ return d->selectedFiles->last();
+ } else {
+ return FALSE;
}
- if ( cur == current() )
- if ( !d->selectedFiles->next() )
- d->selectedFiles->first();
- return TRUE;
- } else {
- if ( !d->selectedFiles->prev() ) {
- if ( mediaPlayerState->looping() ) {
- return d->selectedFiles->last();
- } else {
- return FALSE;
- }
- }
- return TRUE;
- }
- } else {
- return mediaPlayerState->looping();
- }
+ }
+ return TRUE;
+ }
+ } else {
+ return mediaPlayerState->looping();
+ }
}
bool PlayListWidget::next() {
- if ( mediaPlayerState->playlist() ) {
- if ( mediaPlayerState->shuffled() ) {
- return prev();
- } else {
- if ( !d->selectedFiles->next() ) {
- if ( mediaPlayerState->looping() ) {
- return d->selectedFiles->first();
- } else {
- return FALSE;
- }
+ if ( mediaPlayerState->playlist() ) {
+ if ( mediaPlayerState->shuffled() ) {
+ return prev();
+ } else {
+ if ( !d->selectedFiles->next() ) {
+ if ( mediaPlayerState->looping() ) {
+ return d->selectedFiles->first();
+ } else {
+ return FALSE;
}
- return TRUE;
- }
- } else {
- return mediaPlayerState->looping();
- }
+ }
+ return TRUE;
+ }
+ } else {
+ return mediaPlayerState->looping();
+ }
}
bool PlayListWidget::first() {
- if ( mediaPlayerState->playlist() )
- return d->selectedFiles->first();
- else
- return mediaPlayerState->looping();
+ if ( mediaPlayerState->playlist() )
+ return d->selectedFiles->first();
+ else
+ return mediaPlayerState->looping();
}
bool PlayListWidget::last() {
- if ( mediaPlayerState->playlist() )
- return d->selectedFiles->last();
- else
- return mediaPlayerState->looping();
+ if ( mediaPlayerState->playlist() )
+ return d->selectedFiles->last();
+ else
+ return mediaPlayerState->looping();
}
@@ -691,71 +684,70 @@ void PlayListWidget::saveList() {
void PlayListWidget::loadList( const DocLnk & lnk) {
- QString name = lnk.name();
-// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
-
- if( name.length()>0) {
- setCaption("OpiePlayer: "+name);
-// qDebug("<<<<<<<<<<<<load list "+ lnk.file());
- clearList();
- readm3u(lnk.file());
- tabWidget->setCurrentPage(0);
- }
+ QString name = lnk.name();
+ // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
+
+ if( name.length()>0) {
+ setCaption("OpiePlayer: "+name);
+ // qDebug("<<<<<<<<<<<<load list "+ lnk.file());
+ clearList();
+ readm3u(lnk.file());
+ tabWidget->setCurrentPage(0);
+ }
}
void PlayListWidget::setPlaylist( bool shown ) {
- if ( shown )
- d->playListFrame->show();
- else
- d->playListFrame->hide();
+ if ( shown )
+ d->playListFrame->show();
+ else
+ d->playListFrame->hide();
}
void PlayListWidget::setView( char view ) {
- if ( view == 'l' )
- showMaximized();
- else
- hide();
+ if ( view == 'l' )
+ showMaximized();
+ else
+ hide();
}
void PlayListWidget::addSelected() {
- qDebug("addSelected");
- DocLnk lnk;
- QString filename;
- switch (tabWidget->currentPageIndex()) {
-
- case 0: //playlist
- return;
- break;
- case 1: { //audio
+ DocLnk lnk;
+ QString filename;
+ switch (tabWidget->currentPageIndex()) {
+
+ case 0: //playlist
+ return;
+ break;
+ case 1: { //audio
QListViewItemIterator it( audioView );
for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
- filename = it.current()->text(3);
- lnk.setName( QFileInfo(filename).baseName() ); //sets name
- lnk.setFile( filename ); //sets file name
- d->selectedFiles->addToSelection( lnk);
- }
+ if ( it.current()->isSelected() ) {
+ filename = it.current()->text(3);
+ lnk.setName( QFileInfo(filename).baseName() ); //sets name
+ lnk.setFile( filename ); //sets file name
+ d->selectedFiles->addToSelection( lnk);
+ }
}
audioView->clearSelection();
- // d->selectedFiles->next();
- }
- break;
+ // d->selectedFiles->next();
+ }
+ break;
- case 2: { // video
+ case 2: { // video
QListViewItemIterator it( videoView );
for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
+ if ( it.current()->isSelected() ) {
- filename = it.current()->text(3);
- lnk.setName( QFileInfo(filename).baseName() ); //sets name
- lnk.setFile( filename ); //sets file name
- d->selectedFiles->addToSelection( lnk);
- }
+ filename = it.current()->text(3);
+ lnk.setName( QFileInfo(filename).baseName() ); //sets name
+ lnk.setFile( filename ); //sets file name
+ d->selectedFiles->addToSelection( lnk);
+ }
}
videoView->clearSelection();
- }
- break;
- };
-// tabWidget->setCurrentPage(0);
- writeCurrentM3u();
+ }
+ break;
+ };
+ // tabWidget->setCurrentPage(0);
+ writeCurrentM3u();
}
@@ -766,162 +758,156 @@ void PlayListWidget::removeSelected() {
void PlayListWidget::playIt( QListViewItem *) {
-// d->setDocumentUsed = FALSE;
-// mediaPlayerState->curPosition =0;
- qDebug("playIt");
- // mediaPlayerState->setPlaying(FALSE);
- mediaPlayerState->setPlaying(TRUE);
- d->selectedFiles->unSelect();
+ // d->setDocumentUsed = FALSE;
+ // mediaPlayerState->curPosition =0;
+ // mediaPlayerState->setPlaying(FALSE);
+ mediaPlayerState->setPlaying(TRUE);
+ d->selectedFiles->unSelect();
}
void PlayListWidget::addToSelection( QListViewItem *it) {
- d->setDocumentUsed = FALSE;
+ d->setDocumentUsed = FALSE;
- if(it) {
- switch ( tabWidget->currentPageIndex()) {
- case 0: //playlist
- return;
- break;
- };
- // case 1: {
- DocLnk lnk;
- QString filename;
-
- filename=it->text(3);
- lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
- lnk.setFile( filename ); //sets file name
- d->selectedFiles->addToSelection( lnk);
+ if(it) {
+ switch ( tabWidget->currentPageIndex()) {
+ case 0: //playlist
+ return;
+ break;
+ };
+ // case 1: {
+ DocLnk lnk;
+ QString filename;
+
+ filename=it->text(3);
+ lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
+ lnk.setFile( filename ); //sets file name
+ d->selectedFiles->addToSelection( lnk);
- if(tabWidget->currentPageIndex() == 0)
- writeCurrentM3u();
-// tabWidget->setCurrentPage(0);
+ if(tabWidget->currentPageIndex() == 0)
+ writeCurrentM3u();
+ // tabWidget->setCurrentPage(0);
- }
+ }
}
void PlayListWidget::tabChanged(QWidget *) {
- switch ( tabWidget->currentPageIndex()) {
- case 0:
- {
- if( !tbDeletePlaylist->isHidden())
- tbDeletePlaylist->hide();
- d->tbRemoveFromList->setEnabled(TRUE);
- d->tbAddToList->setEnabled(FALSE);
- }
- break;
- case 1:
- {
- audioView->clear();
- populateAudioView();
-
- if( !tbDeletePlaylist->isHidden())
- tbDeletePlaylist->hide();
- d->tbRemoveFromList->setEnabled(FALSE);
- d->tbAddToList->setEnabled(TRUE);
- }
- break;
- case 2:
- {
- videoView->clear();
- populateVideoView();
- if( !tbDeletePlaylist->isHidden())
- tbDeletePlaylist->hide();
- d->tbRemoveFromList->setEnabled(FALSE);
- d->tbAddToList->setEnabled(TRUE);
- }
- break;
- case 3:
- {
- if( tbDeletePlaylist->isHidden())
- tbDeletePlaylist->show();
- playLists->reread();
- }
- break;
- };
+ switch ( tabWidget->currentPageIndex()) {
+ case 0:
+ {
+ if( !tbDeletePlaylist->isHidden())
+ tbDeletePlaylist->hide();
+ d->tbRemoveFromList->setEnabled(TRUE);
+ d->tbAddToList->setEnabled(FALSE);
+ }
+ break;
+ case 1:
+ {
+ audioView->clear();
+ populateAudioView();
+
+ if( !tbDeletePlaylist->isHidden())
+ tbDeletePlaylist->hide();
+ d->tbRemoveFromList->setEnabled(FALSE);
+ d->tbAddToList->setEnabled(TRUE);
+ }
+ break;
+ case 2:
+ {
+ videoView->clear();
+ populateVideoView();
+ if( !tbDeletePlaylist->isHidden())
+ tbDeletePlaylist->hide();
+ d->tbRemoveFromList->setEnabled(FALSE);
+ d->tbAddToList->setEnabled(TRUE);
+ }
+ break;
+ case 3:
+ {
+ if( tbDeletePlaylist->isHidden())
+ tbDeletePlaylist->show();
+ playLists->reread();
+ }
+ break;
+ };
}
void PlayListWidget::btnPlay(bool b) {
- qDebug("<<<<<<<<<<<<<<<BtnPlay %d", b);
-// mediaPlayerState->setPlaying(b);
- switch ( tabWidget->currentPageIndex()) {
- case 0:
- {
- qDebug("1");
-// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
-// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
-// QMessageBox::message("Note","You are trying to play\na malformed url.");
-// } else {
- mediaPlayerState->setPlaying(b);
- insanityBool=FALSE;
- qDebug("insanity");
-// }
- }
- break;
- case 1:
- {
- qDebug("2");
-// d->selectedFiles->unSelect();
- addToSelection( audioView->currentItem() );
- mediaPlayerState->setPlaying( b);
- d->selectedFiles->removeSelected( );
- d->selectedFiles->unSelect();
- tabWidget->setCurrentPage(1);
- insanityBool=FALSE;
- }// audioView->clearSelection();
- break;
- case 2:
- {
- qDebug("3");
+ // mediaPlayerState->setPlaying(b);
+ switch ( tabWidget->currentPageIndex()) {
+ case 0:
+ {
+ // if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
+ // if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
+ // QMessageBox::message("Note","You are trying to play\na malformed url.");
+ // } else {
+ mediaPlayerState->setPlaying(b);
+ insanityBool=FALSE;
+ qDebug("insanity");
+ // }
+ }
+ break;
+ case 1:
+ {
+ // d->selectedFiles->unSelect();
+ addToSelection( audioView->currentItem() );
+ mediaPlayerState->setPlaying( b);
+ d->selectedFiles->removeSelected( );
+ d->selectedFiles->unSelect();
+ tabWidget->setCurrentPage(1);
+ insanityBool=FALSE;
+ }// audioView->clearSelection();
+ break;
+ case 2:
+ {
- addToSelection( videoView->currentItem() );
- mediaPlayerState->setPlaying( b);
-// qApp->processEvents();
- d->selectedFiles->removeSelected( );
- d->selectedFiles->unSelect();
- tabWidget->setCurrentPage(2);
- insanityBool=FALSE;
- }// videoView->clearSelection();
- break;
- };
+ addToSelection( videoView->currentItem() );
+ mediaPlayerState->setPlaying( b);
+ // qApp->processEvents();
+ d->selectedFiles->removeSelected( );
+ d->selectedFiles->unSelect();
+ tabWidget->setCurrentPage(2);
+ insanityBool=FALSE;
+ }// videoView->clearSelection();
+ break;
+ };
}
void PlayListWidget::deletePlaylist() {
- switch( QMessageBox::information( this, (tr("Remove Playlist?")),
- (tr("You really want to delete\nthis playlist?")),
- (tr("Yes")), (tr("No")), 0 )){
- case 0: // Yes clicked,
- QFile().remove(playLists->selectedDocument().file());
- QFile().remove(playLists->selectedDocument().linkFile());
- playLists->reread();
- break;
- case 1: // Cancel
- break;
- };
+ switch( QMessageBox::information( this, (tr("Remove Playlist?")),
+ (tr("You really want to delete\nthis playlist?")),
+ (tr("Yes")), (tr("No")), 0 )){
+ case 0: // Yes clicked,
+ QFile().remove(playLists->selectedDocument().file());
+ QFile().remove(playLists->selectedDocument().linkFile());
+ playLists->reread();
+ break;
+ case 1: // Cancel
+ break;
+ };
}
void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint&, int )
{
- switch (mouse) {
- case 1:
- break;
- case 2:{
-
- QPopupMenu m;
- m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
- m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
- m.insertSeparator();
- if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
- m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
+ switch (mouse) {
+ case 1:
+ break;
+ case 2:{
+
+ QPopupMenu m;
+ m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+ m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
+ m.insertSeparator();
+ if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
+ m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
- m.exec( QCursor::pos() );
- }
+ m.exec( QCursor::pos() );
+ }
break;
- };
+ };
}
void PlayListWidget::playSelected()
{
- qDebug("playSelected");
btnPlay( true);
// d->selectedFiles->unSelect();
@@ -930,116 +916,116 @@ void PlayListWidget::playSelected()
void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint&, int)
{
- switch (mouse) {
- case 1:
+ switch (mouse) {
+ case 1:
- break;
- case 2:{
- QPopupMenu m;
- m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
- m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
-// m.insertSeparator();
-// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
- m.exec( QCursor::pos() );
- }
break;
- };
+ case 2:{
+ QPopupMenu m;
+ m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+ m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
+ // m.insertSeparator();
+ // m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
+ m.exec( QCursor::pos() );
+ }
+ break;
+ };
}
void PlayListWidget::listDelete() {
- Config cfg( "OpiePlayer" );
- cfg.setGroup("PlayList");
- QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
- QString file;
-// int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
- switch ( tabWidget->currentPageIndex()) {
- case 0:
- break;
- case 1:
- {
- file = audioView->currentItem()->text(0);
- QListIterator<DocLnk> Pdit( files.children() );
- for ( ; Pdit.current(); ++Pdit ) {
- if( Pdit.current()->name() == file) {
- LnkProperties prop( Pdit.current() );
- prop.showMaximized();
- prop.exec();
- }
- }
- populateAudioView();
- }
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("PlayList");
+ currentPlayList = cfg.readEntry("CurrentPlaylist","");
+ QString file;
+ // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+ switch ( tabWidget->currentPageIndex()) {
+ case 0:
break;
- case 2:
- {
-// file = videoView->selectedItem()->text(0);
-// for ( int i = 0; i < noOfFiles; i++ ) {
-// QString entryName;
-// entryName.sprintf( "File%i", i + 1 );
-// QString linkFile = cfg.readEntry( entryName );
-// AppLnk lnk( AppLnk(linkFile));
-// if( lnk.name() == file ) {
-// LnkProperties prop( &lnk);
-// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
-// prop.showMaximized();
-// prop.exec();
-// }
-// }
+ case 1:
+ {
+ file = audioView->currentItem()->text(0);
+ QListIterator<DocLnk> Pdit( files.children() );
+ for ( ; Pdit.current(); ++Pdit ) {
+ if( Pdit.current()->name() == file) {
+ LnkProperties prop( Pdit.current() );
+ prop.showMaximized();
+ prop.exec();
+ }
}
- break;
- };
+ populateAudioView();
+ }
+ break;
+ case 2:
+ {
+ // file = videoView->selectedItem()->text(0);
+ // for ( int i = 0; i < noOfFiles; i++ ) {
+ // QString entryName;
+ // entryName.sprintf( "File%i", i + 1 );
+ // QString linkFile = cfg.readEntry( entryName );
+ // AppLnk lnk( AppLnk(linkFile));
+ // if( lnk.name() == file ) {
+ // LnkProperties prop( &lnk);
+ // // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+ // prop.showMaximized();
+ // prop.exec();
+ // }
+ // }
+ }
+ break;
+ };
}
void PlayListWidget::scanForAudio() {
-// qDebug("scan for audio");
- files.detachChildren();
- QListIterator<DocLnk> sdit( files.children() );
- for ( ; sdit.current(); ++sdit ) {
- delete sdit.current();
- }
- Global::findDocuments( &files, audioMimes);
+ // qDebug("scan for audio");
+ files.detachChildren();
+ QListIterator<DocLnk> sdit( files.children() );
+ for ( ; sdit.current(); ++sdit ) {
+ delete sdit.current();
+ }
+ Global::findDocuments( &files, audioMimes);
audioScan = true;
}
void PlayListWidget::scanForVideo() {
-// qDebug("scan for video");
- vFiles.detachChildren();
- QListIterator<DocLnk> sdit( vFiles.children() );
- for ( ; sdit.current(); ++sdit ) {
- delete sdit.current();
- }
- Global::findDocuments(&vFiles, "video/*");
- videoScan = true;
+ // qDebug("scan for video");
+ vFiles.detachChildren();
+ QListIterator<DocLnk> sdit( vFiles.children() );
+ for ( ; sdit.current(); ++sdit ) {
+ delete sdit.current();
+ }
+ Global::findDocuments(&vFiles, "video/*");
+ videoScan = true;
}
void PlayListWidget::populateAudioView() {
- audioView->clear();
- StorageInfo storageInfo;
- const QList<FileSystem> &fs = storageInfo.fileSystems();
- if(!audioScan) scanForAudio();
+ audioView->clear();
+ StorageInfo storageInfo;
+ const QList<FileSystem> &fs = storageInfo.fileSystems();
+ if(!audioScan) scanForAudio();
- QListIterator<DocLnk> dit( files.children() );
- QListIterator<FileSystem> it ( fs );
+ QListIterator<DocLnk> dit( files.children() );
+ QListIterator<FileSystem> it ( fs );
- QString storage;
- for ( ; dit.current(); ++dit ) {
- for( ; it.current(); ++it ){
- const QString name = (*it)->name();
- const QString path = (*it)->path();
- if(dit.current()->file().find(path) != -1 ) storage=name;
- }
+ QString storage;
+ for ( ; dit.current(); ++dit ) {
+ for( ; it.current(); ++it ){
+ const QString name = (*it)->name();
+ const QString path = (*it)->path();
+ if(dit.current()->file().find(path) != -1 ) storage=name;
+ }
- QListViewItem * newItem;
- if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) {
- long size;
- if( dit.current()->file().left(4) == "http" )
- size=0;
- else
- size = QFile( dit.current()->file() ).size();
-// qDebug(dit.current()->name());
- newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
- QString::number(size ), storage, dit.current()->file());
- newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
- }
- }
+ QListViewItem * newItem;
+ if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) {
+ long size;
+ if( dit.current()->file().left(4) == "http" )
+ size=0;
+ else
+ size = QFile( dit.current()->file() ).size();
+ // qDebug(dit.current()->name());
+ newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
+ QString::number(size ), storage, dit.current()->file());
+ newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
+ }
+ }
}
@@ -1074,59 +1060,49 @@ void PlayListWidget::populateVideoView() {
void PlayListWidget::openFile() {
- qDebug("<<<<<<<<<OPEN File");
- QString filename, name;
- InputDialog *fileDlg;
- fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
- fileDlg->exec();
- if( fileDlg->result() == 1 ) {
- filename = fileDlg->text();
- qDebug( "Selected filename is " + filename );
-// Om3u *m3uList;
- DocLnk lnk;
- Config cfg( "OpiePlayer" );
- cfg.setGroup("PlayList");
-
- QString m3uFile;
- m3uFile = filename;
- if(filename.left(4) == "http") {
- if(filename.find(":",8,TRUE) != -1) { //found a port
-
-// m3uFile = filename.left( filename.find( ":",8,TRUE));
- m3uFile = filename;
- if( m3uFile.right( 1 ).find( '/' ) == -1) {
- m3uFile += "/";
- }
- filename = m3uFile;
-// qDebug("1 "+m3uFile);
-// } else if(filename.left(4) == "http"){
-// m3uFile=filename;
-// m3uFile = m3uFile.right( m3uFile.length() - 7);
-// qDebug("2 "+m3uFile);
-// } else{
-// m3uFile=filename;
-// qDebug("3 "+m3uFile);
- }
- lnk.setName( m3uFile ); //sets name
- lnk.setFile( filename ); //sets file name
- lnk.setIcon("opieplayer2/musicfile");
- d->selectedFiles->addToSelection( lnk );
- writeCurrentM3u();
- }
- else if( filename.right( 3) == "m3u" ) {
- readm3u( filename );
+ QString filename, name;
+ InputDialog *fileDlg;
+ fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
+ fileDlg->exec();
+ if( fileDlg->result() == 1 ) {
+ filename = fileDlg->text();
+ // qDebug( "Selected filename is " + filename );
+ DocLnk lnk;
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("PlayList");
- } else if( filename.right(3) == "pls" ) {
- readPls( filename );
- } else {
- lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
- lnk.setFile( filename ); //sets file name
- d->selectedFiles->addToSelection( lnk);
- writeCurrentM3u();
- }
- }
+ QString m3uFile;
+ m3uFile = filename;
+ if(filename.left(4) == "http") {
+ if(filename.find(":",8,TRUE) != -1) { //found a port
+
+ m3uFile = filename;
+ if( m3uFile.right( 1 ).find( '/' ) == -1) {
+ m3uFile += "/";
+ }
+ filename = m3uFile;
+ = }
+ lnk.setName( m3uFile ); //sets name
+ lnk.setFile( filename ); //sets file name
+ lnk.setIcon("opieplayer2/musicfile");
+ d->selectedFiles->addToSelection( lnk );
+ writeCurrentM3u();
+ }
+ else if( filename.right( 3) == "m3u" ) {
+ readm3u( filename );
+
+ } else if( filename.right(3) == "pls" ) {
+ readPls( filename );
+ } else {
+ lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
+ lnk.setFile( filename ); //sets file name
+ d->selectedFiles->addToSelection( lnk);
+ lnk.removeLinkFile();
+ writeCurrentM3u();
+ }
+ }
- if( fileDlg ) {
- delete fileDlg;
- }
+ if( fileDlg ) {
+ delete fileDlg;
+ }
}
@@ -1135,54 +1111,54 @@ void PlayListWidget::openFile() {
reads m3u and shows files/urls to playlist widget */
void PlayListWidget::readm3u( const QString &filename ) {
- qDebug( "read m3u filename " + filename );
-
- Om3u *m3uList;
- QString s, name;
- m3uList = new Om3u( filename, IO_ReadOnly );
- m3uList->readM3u();
- DocLnk lnk;
- for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
- s = *it;
-// qDebug("reading "+ s);
- if(s.left(4)=="http") {
- lnk.setName( s ); //sets file name
- lnk.setIcon("opieplayer2/musicfile");
-
-// if(s.right(4) != '.' || s.right(5) != '.')
- if(s.right(4) != '.' || s.right(5) != '.' )
- if( s.right(1) != "/")
- lnk.setFile( s+"/"); //if url with no extension
- else
- lnk.setFile( s ); //sets file name
+ // qDebug( "read m3u filename " + filename );
+
+ Om3u *m3uList;
+ QString s, name;
+ m3uList = new Om3u( filename, IO_ReadOnly );
+ m3uList->readM3u();
+ DocLnk lnk;
+ for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
+ s = *it;
+ // qDebug("reading "+ s);
+ if(s.left(4)=="http") {
+ lnk.setName( s ); //sets file name
+ lnk.setIcon("opieplayer2/musicfile");
+
+ // if(s.right(4) != '.' || s.right(5) != '.')
+ if(s.right(4) != '.' || s.right(5) != '.' )
+ if( s.right(1) != "/")
+ lnk.setFile( s+"/"); //if url with no extension
+ else
+ lnk.setFile( s ); //sets file name
- } else {
- // if( QFileInfo( s ).exists() ) {
- lnk.setName( fullBaseName ( QFileInfo(s)));
- // if(s.right(4) == '.') {//if regular file
- if(s.left(1) != "/") {
+ } else {
+ // if( QFileInfo( s ).exists() ) {
+ lnk.setName( fullBaseName ( QFileInfo(s)));
+ // if(s.right(4) == '.') {//if regular file
+ if(s.left(1) != "/") {
// qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s);
lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
lnk.setIcon("SoundPlayer");
- } else {
+ } else {
// qDebug("set link2 "+s);
lnk.setFile( s);
lnk.setIcon("SoundPlayer");
- }
- }
- d->selectedFiles->addToSelection( lnk );
- }
- Config config( "OpiePlayer" );
- config.setGroup( "PlayList" );
+ }
+ }
+ d->selectedFiles->addToSelection( lnk );
+ }
+ Config config( "OpiePlayer" );
+ config.setGroup( "PlayList" );
- config.writeEntry("CurrentPlaylist",filename);
- config.write();
- currentPlayList=filename;
+ config.writeEntry("CurrentPlaylist",filename);
+ config.write();
+ currentPlayList=filename;
// m3uList->write();
- m3uList->close();
- if(m3uList) delete m3uList;
+ m3uList->close();
+ if(m3uList) delete m3uList;
- d->selectedFiles->setSelectedItem( s);
- setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename)));
+ d->selectedFiles->setSelectedItem( s);
+ setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename)));
}
@@ -1192,42 +1168,42 @@ reads pls and adds files/urls to playlist */
void PlayListWidget::readPls( const QString &filename ) {
- qDebug( "pls filename is " + filename );
- Om3u *m3uList;
- QString s, name;
- m3uList = new Om3u( filename, IO_ReadOnly );
- m3uList->readPls();
-
- for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
- s = *it;
- // s.replace( QRegExp( "%20" )," " );
- DocLnk lnk( s );
- QFileInfo f( s );
- QString name = fullBaseName ( f);
-
- if( name.left( 4 ) == "http" ) {
- name = s.right( s.length() - 7);
- } else {
- name = s;
- }
+ // qDebug( "pls filename is " + filename );
+ Om3u *m3uList;
+ QString s, name;
+ m3uList = new Om3u( filename, IO_ReadOnly );
+ m3uList->readPls();
+
+ for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
+ s = *it;
+ // s.replace( QRegExp( "%20" )," " );
+ DocLnk lnk( s );
+ QFileInfo f( s );
+ QString name = fullBaseName ( f);
+
+ if( name.left( 4 ) == "http" ) {
+ name = s.right( s.length() - 7);
+ } else {
+ name = s;
+ }
- name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
+ name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
- lnk.setName( name );
- if( s.at( s.length() - 4) == '.') {// if this is probably a file
- lnk.setFile( s );
- } else { //if its a url
- if( name.right( 1 ).find( '/' ) == -1) {
- s += "/";
- }
- lnk.setFile( s );
- }
- lnk.setType( "audio/x-mpegurl" );
+ lnk.setName( name );
+ if( s.at( s.length() - 4) == '.') {// if this is probably a file
+ lnk.setFile( s );
+ } else { //if its a url
+ if( name.right( 1 ).find( '/' ) == -1) {
+ s += "/";
+ }
+ lnk.setFile( s );
+ }
+ lnk.setType( "audio/x-mpegurl" );
- lnk.writeLink();
- d->selectedFiles->addToSelection( lnk );
- }
+ lnk.writeLink();
+ d->selectedFiles->addToSelection( lnk );
+ }
- m3uList->close();
- if(m3uList) delete m3uList;
+ m3uList->close();
+ if(m3uList) delete m3uList;
}
@@ -1235,18 +1211,18 @@ void PlayListWidget::readPls( const QString &filename ) {
writes current playlist to current m3u file */
void PlayListWidget::writeCurrentM3u() {
- qDebug("writing to current m3u");
+ // qDebug("writing to current m3u");
Config cfg( "OpiePlayer" );
cfg.setGroup("PlayList");
- QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+ currentPlayList = cfg.readEntry("CurrentPlaylist","");
Om3u *m3uList;
- m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
+ m3uList = new Om3u( currentPlayList, IO_ReadWrite | IO_Truncate );
if( d->selectedFiles->first()) {
do {
- qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
+ // qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
m3uList->add( d->selectedFiles->current()->file() );
}
while ( d->selectedFiles->next() );
- qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+ // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
m3uList->write();
m3uList->close();
@@ -1259,56 +1235,56 @@ void PlayListWidget::writeCurrentM3u() {
writes current playlist to m3u file */
void PlayListWidget::writem3u() {
- InputDialog *fileDlg;
- fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
- fileDlg->exec();
- QString name, filename, list;
- Om3u *m3uList;
-
- if( fileDlg->result() == 1 ) {
- name = fileDlg->text();
-// qDebug( filename );
- if( name.find("/",0,true) != -1) {// assume they specify a file path
- filename = name;
- name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
- }
- else //otherwise dump it somewhere noticable
- filename = QPEApplication::documentDir() + "/" + name;
+ InputDialog *fileDlg;
+ fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
+ fileDlg->exec();
+ QString name, filename, list;
+ Om3u *m3uList;
+
+ if( fileDlg->result() == 1 ) {
+ name = fileDlg->text();
+ // qDebug( filename );
+ if( name.find("/",0,true) != -1) {// assume they specify a file path
+ filename = name;
+ name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
+ }
+ else //otherwise dump it somewhere noticable
+ filename = QPEApplication::documentDir() + "/" + name;
- if( filename.right( 3 ) != "m3u" ) //needs filename extension
- filename += ".m3u";
+ if( filename.right( 3 ) != "m3u" ) //needs filename extension
+ filename += ".m3u";
- if( d->selectedFiles->first()) {
- m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
+ if( d->selectedFiles->first()) {
+ m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
- do {
+ do {
m3uList->add( d->selectedFiles->current()->file());
- }
- while ( d->selectedFiles->next() );
- // qDebug( list );
- m3uList->write();
- m3uList->close();
- if(m3uList) delete m3uList;
+ }
+ while ( d->selectedFiles->next() );
+ // qDebug( list );
+ m3uList->write();
+ m3uList->close();
+ if(m3uList) delete m3uList;
- if(fileDlg) delete fileDlg;
+ if(fileDlg) delete fileDlg;
- DocLnk lnk;
- lnk.setFile( filename);
- lnk.setIcon("opieplayer2/playlist2");
- lnk.setName( name); //sets file name
+ DocLnk lnk;
+ lnk.setFile( filename);
+ lnk.setIcon("opieplayer2/playlist2");
+ lnk.setName( name); //sets file name
- // qDebug(filename);
- Config config( "OpiePlayer" );
- config.setGroup( "PlayList" );
+ // qDebug(filename);
+ Config config( "OpiePlayer" );
+ config.setGroup( "PlayList" );
- config.writeEntry("CurrentPlaylist",filename);
- currentPlayList=filename;
+ config.writeEntry("CurrentPlaylist",filename);
+ currentPlayList=filename;
- if(!lnk.writeLink()) {
- qDebug("Writing doclink did not work");
- }
+ if(!lnk.writeLink()) {
+ // qDebug("Writing doclink did not work");
+ }
- setCaption(tr("OpiePlayer: ") + name);
- }
- }
+ setCaption(tr("OpiePlayer: ") + name);
+ }
+ }
}
@@ -1335,5 +1311,4 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
break;
case Key_Q: //add to playlist
- qDebug("Add");
addSelected();
break;
@@ -1346,5 +1321,4 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
// break;
case Key_Space:
- qDebug("Play");
// playSelected(); puh
break;
@@ -1399,68 +1373,68 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
void PlayListWidget::doBlank() {
- qDebug("do blanking");
- fd=open("/dev/fb0",O_RDWR);
- if (fd != -1) {
- ioctl(fd,FBIOBLANK,1);
-// close(fd);
- }
+ // qDebug("do blanking");
+ fd=open("/dev/fb0",O_RDWR);
+ if (fd != -1) {
+ ioctl(fd,FBIOBLANK,1);
+ // close(fd);
+ }
}
void PlayListWidget::doUnblank() {
- // this crashes opieplayer with a segfault
-// int fd;
-// fd=open("/dev/fb0",O_RDWR);
- qDebug("do unblanking");
- if (fd != -1) {
- ioctl(fd,FBIOBLANK,0);
- close(fd);
- }
- QCopEnvelope h("QPE/System", "setBacklight(int)");
- h <<-3;// v[1]; // -3 Force on
+ // this crashes opieplayer with a segfault
+ // int fd;
+ // fd=open("/dev/fb0",O_RDWR);
+ // qDebug("do unblanking");
+ if (fd != -1) {
+ ioctl(fd,FBIOBLANK,0);
+ close(fd);
+ }
+ QCopEnvelope h("QPE/System", "setBacklight(int)");
+ h <<-3;// v[1]; // -3 Force on
}
void PlayListWidget::populateSkinsMenu() {
- int item = 0;
- defaultSkinIndex = 0;
- QString skinName;
- Config cfg( "OpiePlayer" );
- cfg.setGroup("Options" );
- QString skin = cfg.readEntry( "Skin", "default" );
-
- QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
- skinsDir.setFilter( QDir::Dirs );
- skinsDir.setSorting(QDir::Name );
- const QFileInfoList *skinslist = skinsDir.entryInfoList();
- QFileInfoListIterator it( *skinslist );
- QFileInfo *fi;
- while ( ( fi = it.current() ) ) {
- skinName = fi->fileName();
-// qDebug( fi->fileName() );
- if( skinName != "." && skinName != ".." && skinName !="CVS" ) {
- item = skinsMenu->insertItem( fi->fileName() ) ;
- }
- if( skinName == "default" ) {
- defaultSkinIndex = item;
- }
- if( skinName == skin ) {
- skinsMenu->setItemChecked( item, TRUE );
- }
- ++it;
- }
+ int item = 0;
+ defaultSkinIndex = 0;
+ QString skinName;
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("Options" );
+ QString skin = cfg.readEntry( "Skin", "default" );
+
+ QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
+ skinsDir.setFilter( QDir::Dirs );
+ skinsDir.setSorting(QDir::Name );
+ const QFileInfoList *skinslist = skinsDir.entryInfoList();
+ QFileInfoListIterator it( *skinslist );
+ QFileInfo *fi;
+ while ( ( fi = it.current() ) ) {
+ skinName = fi->fileName();
+ // qDebug( fi->fileName() );
+ if( skinName != "." && skinName != ".." && skinName !="CVS" ) {
+ item = skinsMenu->insertItem( fi->fileName() ) ;
+ }
+ if( skinName == "default" ) {
+ defaultSkinIndex = item;
+ }
+ if( skinName == skin ) {
+ skinsMenu->setItemChecked( item, TRUE );
+ }
+ ++it;
+ }
}
void PlayListWidget::skinsMenuActivated( int item ) {
- for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
- skinsMenu->setItemChecked( i, FALSE );
- }
- skinsMenu->setItemChecked( item, TRUE );
+ for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
+ skinsMenu->setItemChecked( i, FALSE );
+ }
+ skinsMenu->setItemChecked( item, TRUE );
- Config cfg( "OpiePlayer" );
- cfg.setGroup("Options");
- cfg.writeEntry("Skin", skinsMenu->text( item ) );
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("Options");
+ cfg.writeEntry("Skin", skinsMenu->text( item ) );
}
void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
- qDebug("qcop message "+msg );
+ // qDebug("qcop message "+msg );
QDataStream stream ( data, IO_ReadOnly );
if ( msg == "play()" ) { //plays current selection
@@ -1479,9 +1453,9 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
mediaPlayerState->toggleShuffled();
} else if ( msg == "volUp()" ) { //volume more
-// emit moreClicked();
-// emit moreReleased();
+ // emit moreClicked();
+ // emit moreReleased();
} else if ( msg == "volDown()" ) { //volume less
-// emit lessClicked();
-// emit lessReleased();
+ // emit lessClicked();
+ // emit lessReleased();
} else if ( msg == "play(QString)" ) { //play this now
QString file;
@@ -1499,8 +1473,6 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
QString file;
stream >> file;
-
} else if ( msg == "setDocument(QString)" ) { //loop or not loop
- QCopEnvelope h("QPE/Application/opieplayer", "raise()");
+ QCopEnvelope h("QPE/Application/opieplayer", "raise()");
}
-
}
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 48104ca..02c8568 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -87,5 +87,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
skinPath = "opieplayer2/skins/default";
- qDebug("skin path " + skinPath);
+ // qDebug("skin path " + skinPath);
// QString skinPath = "opieplayer2/skins/" + skin;
@@ -102,5 +102,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
"/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
- qDebug("loading "+filename);
+ // qDebug("loading "+filename);
masks[i] = new QBitmap( filename );
@@ -120,5 +120,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
}
}
- qDebug("finished loading first pics");
+ // qDebug("finished loading first pics");
for ( int i = 0; i < 7; i++ )
{
@@ -352,5 +352,5 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
case VideoPlay: {
- qDebug("play");
+ // qDebug("play");
if( !mediaPlayerState->playing()) {
mediaPlayerState->setPlaying( true);
@@ -360,10 +360,10 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
if( mediaPlayerState->isPaused ) {
- qDebug("isPaused");
+ // qDebug("isPaused");
setToggleButton( i, FALSE );
mediaPlayerState->setPaused( FALSE );
return;
} else if( !mediaPlayerState->isPaused ) {
- qDebug("is not paused");
+ // qDebug("is not paused");
setToggleButton( i, TRUE );
mediaPlayerState->setPaused( TRUE );
@@ -374,6 +374,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
- case VideoStop: qDebug("stop"); mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return;
- case VideoNext: mediaPlayerState->setNext(); return;
+ case VideoStop: mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return;
+ case VideoNext: mediaPlayerState->setNext(); return;
case VideoPrevious: mediaPlayerState->setPrev(); return;
case VideoVolUp: emit moreReleased(); return;