summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-21 12:59:29 (UTC)
committer llornkcor <llornkcor>2002-04-21 12:59:29 (UTC)
commit1c7b8ce5b548a414845b873428bf5a6b36eebb83 (patch) (unidiff)
treea87a17860a1b0454154bd2c4874cb61c01c7db11
parentc7a23ea04b627db855934fac5061d7e291cdf230 (diff)
downloadopie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.zip
opie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.tar.gz
opie-1c7b8ce5b548a414845b873428bf5a6b36eebb83.tar.bz2
hide slider when streaming
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp3
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro2
-rw-r--r--core/multimedia/opieplayer/loopcontrol.cpp2
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.pro2
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
@@ -105,5 +105,6 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
105 setPaused( mediaPlayerState->paused() ); 105 setPaused( mediaPlayerState->paused() );
106 setPlaying( mediaPlayerState->playing() ); 106 setPlaying( mediaPlayerState->playing() );
107 107 if (mediaPlayerState->isStreaming) slider->hide();
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
@@ -37,5 +37,5 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
37TARGET = mpeg3plugin 37TARGET = mpeg3plugin
38TMAKE_CC=g++ 38TMAKE_CC=g++
39DESTDIR = ../../plugins/codecs 39DESTDIR = $(OPIEDIR)/plugins/codecs
40INCLUDEPATH += $(OPIEDIR)/include .. 40INCLUDEPATH += $(OPIEDIR)/include ..
41DEPENDPATH += ../$(OPIEDIR)/include .. 41DEPENDPATH += ../$(OPIEDIR)/include ..
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
@@ -248,6 +248,6 @@ void LoopControl::startAudio() {
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
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
@@ -4,5 +4,5 @@ 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
7INCLUDEPATH += $(OPIEDIR)/include .. 7INCLUDEPATH += $(OPIEDIR)/include ..
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..