summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-03 13:13:51 (UTC)
committer harlekin <harlekin>2002-08-03 13:13:51 (UTC)
commit6599cb97da09fc05bbe6e6380c1c0bb128ecb034 (patch) (unidiff)
treefb8401af472525ae431ccde87da3c1b1a083cb0e
parente97e6d869d0d3cb971a53f5a9ceacc1c93fcb3e0 (diff)
downloadopie-6599cb97da09fc05bbe6e6380c1c0bb128ecb034.zip
opie-6599cb97da09fc05bbe6e6380c1c0bb128ecb034.tar.gz
opie-6599cb97da09fc05bbe6e6380c1c0bb128ecb034.tar.bz2
fixes some typos
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h2
2 files changed, 12 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 3faeab1..7337c97 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -35,26 +35,26 @@
35#include <qtimer.h> 35#include <qtimer.h>
36#include "xinecontrol.h" 36#include "xinecontrol.h"
37#include "mediaplayerstate.h" 37#include "mediaplayerstate.h"
38#include "videowidget.h" 38#include "videowidget.h"
39 39
40extern MediaPlayerState *mediaPlayerState; 40extern MediaPlayerState *mediaPlayerState;
41extern VideoWidget *videoUI; 41extern VideoWidget *videoUI;
42XineControl::XineControl( QObject *parent, const char *name ) 42XineControl::XineControl( QObject *parent, const char *name )
43 : QObject( parent, name ) { 43 : QObject( parent, name ) {
44 libXine = new XINE::Lib(videoUI->vidWidget() ); 44 libXine = new XINE::Lib(videoUI->vidWidget() );
45 45
46 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 46 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
47 connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); 47 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
48 connect(this, SIGNAL( postitionChanged(int position) ), mediaPlayerState, SLOT( setPosition( long p ) ) ); 48 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( setPosition( long ) ) );
49 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 49 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
50 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 50 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
51 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 51 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
52 52
53} 53}
54 54
55XineControl::~XineControl() { 55XineControl::~XineControl() {
56 delete libXine; 56 delete libXine;
57} 57}
58 58
59void XineControl::play( const QString& fileName ) { 59void XineControl::play( const QString& fileName ) {
60 libXine->play( fileName ); 60 libXine->play( fileName );
@@ -69,24 +69,26 @@ void XineControl::play( const QString& fileName ) {
69 69
70 if (whichGui == 'a') { 70 if (whichGui == 'a') {
71 libXine->setShowVideo( false ); 71 libXine->setShowVideo( false );
72 } else { 72 } else {
73 libXine->setShowVideo( true ); 73 libXine->setShowVideo( true );
74 } 74 }
75 75
76 // determine if slider is shown 76 // determine if slider is shown
77 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); 77 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
78 mediaPlayerState->setIsStreaming( libXine->isSeekable() ); 78 mediaPlayerState->setIsStreaming( libXine->isSeekable() );
79 // which gui (video / audio) 79 // which gui (video / audio)
80 mediaPlayerState->setView( whichGui ); 80 mediaPlayerState->setView( whichGui );
81 length();
82 position();
81 83
82} 84}
83 85
84void XineControl::stop( bool isSet ) { 86void XineControl::stop( bool isSet ) {
85 if ( !isSet) { 87 if ( !isSet) {
86 libXine->stop(); 88 libXine->stop();
87 mediaPlayerState->setList(); 89 mediaPlayerState->setList();
88 //mediaPlayerState->setPlaying( false ); 90 //mediaPlayerState->setPlaying( false );
89 } else { 91 } else {
90 // play again 92 // play again
91 } 93 }
92} 94}
@@ -98,26 +100,30 @@ void XineControl::pause( bool isSet) {
98int XineControl::currentTime() { 100int XineControl::currentTime() {
99 // todo: jede sekunde überprüfen 101 // todo: jede sekunde überprüfen
100 m_currentTime = libXine->currentTime(); 102 m_currentTime = libXine->currentTime();
101 return m_currentTime; 103 return m_currentTime;
102} 104}
103 105
104void XineControl::length() { 106void XineControl::length() {
105 m_length = libXine->length(); 107 m_length = libXine->length();
106 mediaPlayerState->setLength( m_length ); 108 mediaPlayerState->setLength( m_length );
107} 109}
108 110
109int XineControl::position() { 111int XineControl::position() {
110 m_position = (m_currentTime/m_length*100); 112 length();
113 qDebug("M_LENGTH :" + m_length);
114 m_position = ( currentTime() /m_length*100);
111 mediaPlayerState->setPosition( m_position ); 115 mediaPlayerState->setPosition( m_position );
116 long emitPos = (long)m_position;
117 emit positionChanged( emitPos );
118 QTimer::singleShot( 1000, this, SLOT( position() ) );
119 qDebug("POSITION : " + m_position);
112 return m_position; 120 return m_position;
113 emit positionChanged( m_position );
114 QTimer::singleShot( 1000, this, SLOT( position ) );
115} 121}
116 122
117void XineControl::setFullscreen( bool isSet ) { 123void XineControl::setFullscreen( bool isSet ) {
118 libXine->showVideoFullScreen( isSet); 124 libXine->showVideoFullScreen( isSet);
119} 125}
120 126
121void XineControl::seekTo( long second ) { 127void XineControl::seekTo( long second ) {
122 // libXine-> 128 // libXine->
123} 129}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 47eee91..5f3d7c2 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -55,18 +55,18 @@ public slots:
55 void length(); 55 void length();
56 56
57 int position(); 57 int position();
58 58
59private: 59private:
60 XINE::Lib *libXine; 60 XINE::Lib *libXine;
61 MediaDetect mdetect; 61 MediaDetect mdetect;
62 int m_length; 62 int m_length;
63 int m_currentTime; 63 int m_currentTime;
64 int m_position; 64 int m_position;
65 65
66signals: 66signals:
67 void positionChanged( int position ); 67 void positionChanged( long position );
68 68
69}; 69};
70 70
71 71
72#endif 72#endif