| -rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 3 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | 2 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 2 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/wavplugin/wavplugin.pro | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 20345b7..b9561d5 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -104,7 +104,8 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : setLooping( mediaPlayerState->fullscreen() ); setPaused( mediaPlayerState->paused() ); setPlaying( mediaPlayerState->playing() ); - + if (mediaPlayerState->isStreaming) slider->hide(); + } diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index e50aa4e..f5e5954 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro @@ -36,7 +36,7 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ video/vlc.c TARGET = mpeg3plugin TMAKE_CC=g++ -DESTDIR = ../../plugins/codecs +DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lpthread -lm diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 15175d0..01596a0 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp @@ -247,8 +247,8 @@ void LoopControl::startAudio() { // } audioDevice->write( audioBuffer, samplesRead * 2 * channels ); - if( mediaPlayerState->isStreaming == FALSE); +// if( mediaPlayerState->isStreaming == FALSE) audioSampleCounter = currentSample + samplesRead - 1; moreAudio = readOk && (audioSampleCounter <= total_audio_samples); diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro index 2160431..f0834de 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on release HEADERS = wavplugin.h wavpluginimpl.h SOURCES = wavplugin.cpp wavpluginimpl.cpp TARGET = wavplugin -DESTDIR = ../../plugins/codecs +DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe |