summaryrefslogtreecommitdiff
Unidiff
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
@@ -95,25 +95,26 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
95 95
96 if( !mediaPlayerState->isStreaming) { // this stops the slider from being moved, thus 96 if( !mediaPlayerState->isStreaming) { // this stops the slider from being moved, thus
97 // does not stop stream when it reaches the end 97 // does not stop stream when it reaches the end
98 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 98 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
99 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 99 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
100 } 100 }
101 // Intialise state 101 // Intialise state
102 setLength( mediaPlayerState->length() ); 102 setLength( mediaPlayerState->length() );
103 setPosition( mediaPlayerState->position() ); 103 setPosition( mediaPlayerState->position() );
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 107 if (mediaPlayerState->isStreaming) slider->hide();
108
108} 109}
109 110
110 111
111AudioWidget::~AudioWidget() { 112AudioWidget::~AudioWidget() {
112 for ( int i = 0; i < 4; i++ ) 113 for ( int i = 0; i < 4; i++ )
113 delete pixmaps[i]; 114 delete pixmaps[i];
114} 115}
115 116
116 117
117static bool audioSliderBeingMoved = FALSE; 118static bool audioSliderBeingMoved = FALSE;
118 119
119 120
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
@@ -27,17 +27,17 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
27 video/idct.c \ 27 video/idct.c \
28 video/macroblocks.c \ 28 video/macroblocks.c \
29 video/mmxtest.c \ 29 video/mmxtest.c \
30 video/motion.c \ 30 video/motion.c \
31 video/mpeg3video.c \ 31 video/mpeg3video.c \
32 video/output.c \ 32 video/output.c \
33 video/reconstruct.c \ 33 video/reconstruct.c \
34 video/seek.c \ 34 video/seek.c \
35 video/slice.c \ 35 video/slice.c \
36 video/vlc.c 36 video/vlc.c
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 ..
42LIBS += -lqpe -lpthread -lm 42LIBS += -lqpe -lpthread -lm
43VERSION = 1.0.0 43VERSION = 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
@@ -238,26 +238,26 @@ void LoopControl::startAudio() {
238 238
239// this causes drop outs not sure why its even here 239// this causes drop outs not sure why its even here
240// if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { 240// if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
241// usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); 241// usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
242// } 242// }
243// else if ( sampleWaitTime <= -5000 ) { 243// else if ( sampleWaitTime <= -5000 ) {
244// qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); 244// qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
245// //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); 245// //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
246// currentSample = sampleWeShouldBeAt; 246// currentSample = sampleWeShouldBeAt;
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);
255 255
256 } else { 256 } else {
257 257
258 moreAudio = FALSE; 258 moreAudio = FALSE;
259 259
260 } 260 }
261 261
262 } 262 }
263 263
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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 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
7INCLUDEPATH += $(OPIEDIR)/include .. 7INCLUDEPATH += $(OPIEDIR)/include ..
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0