summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-21 12:59:29 (UTC)
committer llornkcor <llornkcor>2002-04-21 12:59:29 (UTC)
commit1c7b8ce5b548a414845b873428bf5a6b36eebb83 (patch) (side-by-side diff)
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
@@ -101,13 +101,14 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
// Intialise state
setLength( mediaPlayerState->length() );
setPosition( mediaPlayerState->position() );
setLooping( mediaPlayerState->fullscreen() );
setPaused( mediaPlayerState->paused() );
setPlaying( mediaPlayerState->playing() );
-
+ if (mediaPlayerState->isStreaming) slider->hide();
+
}
AudioWidget::~AudioWidget() {
for ( int i = 0; i < 4; i++ )
delete pixmaps[i];
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
@@ -33,11 +33,11 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
video/reconstruct.c \
video/seek.c \
video/slice.c \
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
VERSION = 1.0.0
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
@@ -244,14 +244,14 @@ void LoopControl::startAudio() {
// qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
// //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
// currentSample = sampleWeShouldBeAt;
// }
audioDevice->write( audioBuffer, samplesRead * 2 * channels );
- if( mediaPlayerState->isStreaming == FALSE);
+// if( mediaPlayerState->isStreaming == FALSE)
audioSampleCounter = currentSample + samplesRead - 1;
moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
} else {
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
@@ -1,10 +1,10 @@
TEMPLATE = lib
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
VERSION = 1.0.0