| -rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 12 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 20 |
2 files changed, 18 insertions, 14 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 9a55608..3dfe182 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -29,3 +29,3 @@ #include <qlayout.h> - +#include <qdir.h> #include "audiowidget.h" @@ -83,3 +83,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : skin = cfg.readEntry("Skin","default"); - //skin = "scaleTest"; + //skin = "scaleTest"; // color of background, frame, degree of transparency @@ -87,4 +87,8 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : // QString skinPath = "opieplayer/skins/" + skin; - QString skinPath = "opieplayer2/skins/" + skin; - qDebug("skin path "+skinPath); + QString skinPath; + skinPath = "opieplayer2/skins/" + skin; + if(!QDir(skinPath).exists()) + skinPath = "opieplayer2/skins/default"; + + qDebug("skin path " + skinPath); diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index ba14882..8cf0a75 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp @@ -102,3 +102,3 @@ LoopControl::LoopControl( QObject *parent, const char *name ) connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); -//qDebug("starting loopcontrol"); +qDebug("starting loopcontrol"); audioMutex = new Mutex; @@ -119,3 +119,3 @@ LoopControl::LoopControl( QObject *parent, const char *name ) #endif -//qDebug("create audio thread"); +qDebug("create audio thread"); pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); @@ -366,8 +366,8 @@ bool LoopControl::init( const QString& filename ) { // ### 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->curDecoder()->pluginName() == QString("LibMadPlugin") ) { +// if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename )) { +// total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); +// mediaPlayerState->libMpeg3Decoder()->close(); +// } +// } @@ -391,3 +391,3 @@ bool LoopControl::init( const QString& filename ) { - if ( !total_audio_samples ) +// if ( !total_audio_samples ) total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); @@ -395,3 +395,3 @@ bool LoopControl::init( const QString& filename ) { total_audio_samples += 1000; - + qDebug("total samples %d", total_audio_samples); mediaPlayerState->setLength( total_audio_samples ); |