author | llornkcor <llornkcor> | 2002-04-21 12:59:29 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-21 12:59:29 (UTC) |
commit | 1c7b8ce5b548a414845b873428bf5a6b36eebb83 (patch) (unidiff) | |
tree | a87a17860a1b0454154bd2c4874cb61c01c7db11 /core | |
parent | c7a23ea04b627db855934fac5061d7e291cdf230 (diff) | |
download | opie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.zip opie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.tar.gz opie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.tar.bz2 |
hide slider when streaming
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 1 | ||||
-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, 4 insertions, 3 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,6 +104,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
104 | setLooping( mediaPlayerState->fullscreen() ); | 104 | setLooping( mediaPlayerState->fullscreen() ); |
105 | setPaused( mediaPlayerState->paused() ); | 105 | setPaused( mediaPlayerState->paused() ); |
106 | setPlaying( mediaPlayerState->playing() ); | 106 | setPlaying( mediaPlayerState->playing() ); |
107 | if (mediaPlayerState->isStreaming) slider->hide(); | ||
107 | 108 | ||
108 | } | 109 | } |
109 | 110 | ||
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 \ | |||
36 | video/vlc.c | 36 | video/vlc.c |
37 | TARGET = mpeg3plugin | 37 | TARGET = mpeg3plugin |
38 | TMAKE_CC=g++ | 38 | TMAKE_CC=g++ |
39 | DESTDIR = ../../plugins/codecs | 39 | DESTDIR = $(OPIEDIR)/plugins/codecs |
40 | INCLUDEPATH += $(OPIEDIR)/include .. | 40 | INCLUDEPATH += $(OPIEDIR)/include .. |
41 | DEPENDPATH += ../$(OPIEDIR)/include .. | 41 | DEPENDPATH += ../$(OPIEDIR)/include .. |
42 | LIBS += -lqpe -lpthread -lm | 42 | 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() { | |||
247 | // } | 247 | // } |
248 | 248 | ||
249 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 249 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
250 | if( mediaPlayerState->isStreaming == FALSE); | ||
251 | 250 | ||
251 | // if( mediaPlayerState->isStreaming == FALSE) | ||
252 | audioSampleCounter = currentSample + samplesRead - 1; | 252 | audioSampleCounter = currentSample + samplesRead - 1; |
253 | 253 | ||
254 | moreAudio = readOk && (audioSampleCounter <= total_audio_samples); | 254 | 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 | |||
3 | HEADERS = wavplugin.h wavpluginimpl.h | 3 | HEADERS = wavplugin.h wavpluginimpl.h |
4 | SOURCES = wavplugin.cpp wavpluginimpl.cpp | 4 | SOURCES = wavplugin.cpp wavpluginimpl.cpp |
5 | TARGET = wavplugin | 5 | TARGET = wavplugin |
6 | DESTDIR = ../../plugins/codecs | 6 | DESTDIR = $(OPIEDIR)/plugins/codecs |
7 | INCLUDEPATH += $(OPIEDIR)/include .. | 7 | INCLUDEPATH += $(OPIEDIR)/include .. |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |