summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-15 19:06:52 (UTC)
committer harlekin <harlekin>2002-08-15 19:06:52 (UTC)
commitcff42f8a8808ef9fd9b65376649857e0e0c2ccc3 (patch) (unidiff)
tree7cf3cca6b2ebb35cd9ffc0ce8adc5568a27ad7d7
parent8cd40434c7011022a8e1706698e5c5075681bd1e (diff)
downloadopie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.zip
opie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.tar.gz
opie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.tar.bz2
stop now working as supposed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp2
4 files changed, 8 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 3b20873..d554141 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -78,171 +78,172 @@ Lib::Lib(XineVideoWidget* widget) {
78 QFile f(str); 78 QFile f(str);
79 f.open(IO_WriteOnly); 79 f.open(IO_WriteOnly);
80 QTextStream ts( &f ); 80 QTextStream ts( &f );
81 ts << "misc.memcpy_method:glibc"; 81 ts << "misc.memcpy_method:glibc";
82 f.close(); 82 f.close();
83 } 83 }
84 84
85 m_config = xine_config_file_init( str.data() ); 85 m_config = xine_config_file_init( str.data() );
86 86
87 // allocate oss for sound 87 // allocate oss for sound
88 // and fb for framebuffer 88 // and fb for framebuffer
89 m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ; 89 m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
90 if (m_audioOutput == NULL ) 90 if (m_audioOutput == NULL )
91 printf("Failure\n"); 91 printf("Failure\n");
92 else 92 else
93 printf("Success\n"); 93 printf("Success\n");
94 94
95 95
96 // test code 96 // test code
97/* m_videoOutput = xine_load_video_output_plugin(m_config, "fb", 97/* m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
98 VISUAL_TYPE_FB, 98 VISUAL_TYPE_FB,
99 0 ); 99 0 );
100*/ 100*/
101 101
102 char** files = xine_list_video_output_plugins(3); 102 char** files = xine_list_video_output_plugins(3);
103 char* out; 103 char* out;
104 int i = 0; 104 int i = 0;
105 while ( ( out = files[i] ) != 0 ) { 105 while ( ( out = files[i] ) != 0 ) {
106 printf("Video %s\n", out ); 106 printf("Video %s\n", out );
107 i++; 107 i++;
108 } 108 }
109// m_xine = xine_init( m_videoOutput, 109// m_xine = xine_init( m_videoOutput,
110// m_audioOutput, 110// m_audioOutput,
111// m_config ); 111// m_config );
112 // test loading 112 // test loading
113 m_videoOutput = ::init_video_out_plugin( m_config, NULL ); 113 m_videoOutput = ::init_video_out_plugin( m_config, NULL );
114 if (m_wid != 0 ) { 114 if (m_wid != 0 ) {
115 printf("!0\n" ); 115 printf("!0\n" );
116 resize ( m_wid-> size ( )); 116 resize ( m_wid-> size ( ));
117 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); 117 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
118 m_wid-> setImage ( new QImage ( Resource::loadImage(""))); 118 m_wid-> setImage ( new QImage ( Resource::loadImage("")));
119 m_wid->repaint(); 119 m_wid->repaint();
120 } 120 }
121 null_display_handler( m_videoOutput, 121 null_display_handler( m_videoOutput,
122 xine_display_frame, 122 xine_display_frame,
123 this ); 123 this );
124 124
125 m_xine = xine_init( m_videoOutput, 125 m_xine = xine_init( m_videoOutput,
126 m_audioOutput, m_config ); 126 m_audioOutput, m_config );
127 // install the event handler 127 // install the event handler
128 xine_register_event_listener( m_xine, xine_event_handler, this ); 128 xine_register_event_listener( m_xine, xine_event_handler, this );
129} 129}
130 130
131Lib::~Lib() { 131Lib::~Lib() {
132 delete m_config; 132 delete m_config;
133 xine_remove_event_listener( m_xine, xine_event_handler ); 133 xine_remove_event_listener( m_xine, xine_event_handler );
134 xine_exit( m_xine ); 134 xine_exit( m_xine );
135 delete m_videoOutput; 135 delete m_videoOutput;
136 //delete m_audioOutput; 136 //delete m_audioOutput;
137 137
138} 138}
139 139
140void Lib::resize ( const QSize &s ) 140void Lib::resize ( const QSize &s )
141{ 141{
142 if ( s. width ( ) && s. height ( )) { 142 if ( s. width ( ) && s. height ( )) {
143 ::null_set_gui_width( m_videoOutput, s. width() ); 143 ::null_set_gui_width( m_videoOutput, s. width() );
144 ::null_set_gui_height(m_videoOutput, s. height() ); 144 ::null_set_gui_height(m_videoOutput, s. height() );
145 } 145 }
146} 146}
147 147
148QCString Lib::version() { 148QCString Lib::version() {
149 QCString str( xine_get_str_version() ); 149 QCString str( xine_get_str_version() );
150 return str; 150 return str;
151}; 151};
152 152
153int Lib::majorVersion() { 153int Lib::majorVersion() {
154 return xine_get_major_version(); 154 return xine_get_major_version();
155} 155}
156int Lib::minorVersion() { 156int Lib::minorVersion() {
157 return xine_get_minor_version(); 157 return xine_get_minor_version();
158}; 158};
159 159
160int Lib::subVersion() { 160int Lib::subVersion() {
161 return xine_get_sub_version(); 161 return xine_get_sub_version();
162} 162}
163int Lib::play( const QString& fileName, 163int Lib::play( const QString& fileName,
164 int startPos, 164 int startPos,
165 int start_time ) { 165 int start_time ) {
166 QString str = fileName.stripWhiteSpace(); 166 QString str = fileName.stripWhiteSpace();
167 //workaround OpiePlayer bug 167 //workaround OpiePlayer bug
168 if (str.right(1) == QString::fromLatin1("/") ) 168 if (str.right(1) == QString::fromLatin1("/") )
169 str = str.mid( str.length() -1 ); 169 str = str.mid( str.length() -1 );
170 return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), 170 return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),
171 startPos, start_time); 171 startPos, start_time);
172} 172}
173void Lib::stop() { 173void Lib::stop() {
174 qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
174 xine_stop(m_xine ); 175 xine_stop(m_xine );
175} 176}
176void Lib::pause(){ 177void Lib::pause(){
177 xine_set_speed( m_xine, SPEED_PAUSE ); 178 xine_set_speed( m_xine, SPEED_PAUSE );
178} 179}
179int Lib::speed() { 180int Lib::speed() {
180 return xine_get_speed( m_xine ); 181 return xine_get_speed( m_xine );
181} 182}
182void Lib::setSpeed( int speed ) { 183void Lib::setSpeed( int speed ) {
183 xine_set_speed( m_xine, speed ); 184 xine_set_speed( m_xine, speed );
184} 185}
185int Lib::status(){ 186int Lib::status(){
186 return xine_get_status( m_xine ); 187 return xine_get_status( m_xine );
187} 188}
188int Lib::currentPosition(){ 189int Lib::currentPosition(){
189 return xine_get_current_position( m_xine ); 190 return xine_get_current_position( m_xine );
190} 191}
191int Lib::currentTime() { 192int Lib::currentTime() {
192 return xine_get_current_time( m_xine ); 193 return xine_get_current_time( m_xine );
193}; 194};
194int Lib::length() { 195int Lib::length() {
195 return xine_get_stream_length( m_xine ); 196 return xine_get_stream_length( m_xine );
196} 197}
197bool Lib::isSeekable() { 198bool Lib::isSeekable() {
198 return xine_is_stream_seekable(m_xine); 199 return xine_is_stream_seekable(m_xine);
199} 200}
200Frame Lib::currentFrame() { 201Frame Lib::currentFrame() {
201 Frame frame; 202 Frame frame;
202 return frame; 203 return frame;
203}; 204};
204int Lib::error() { 205int Lib::error() {
205 return xine_get_error( m_xine ); 206 return xine_get_error( m_xine );
206}; 207};
207void Lib::handleXineEvent( xine_event_t* t ) { 208void Lib::handleXineEvent( xine_event_t* t ) {
208 if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) 209 if ( t->type == XINE_EVENT_PLAYBACK_FINISHED )
209 emit stopped(); 210 emit stopped();
210} 211}
211void Lib::setShowVideo( bool video ) { 212void Lib::setShowVideo( bool video ) {
212 m_video = video; 213 m_video = video;
213 ::null_set_show_video( m_videoOutput, video ); 214 ::null_set_show_video( m_videoOutput, video );
214} 215}
215bool Lib::isShowingVideo() { 216bool Lib::isShowingVideo() {
216 return ::null_is_showing_video( m_videoOutput ); 217 return ::null_is_showing_video( m_videoOutput );
217} 218}
218void Lib::showVideoFullScreen( bool fullScreen ) { 219void Lib::showVideoFullScreen( bool fullScreen ) {
219 ::null_set_fullscreen( m_videoOutput, fullScreen ); 220 ::null_set_fullscreen( m_videoOutput, fullScreen );
220} 221}
221bool Lib::isVideoFullScreen() { 222bool Lib::isVideoFullScreen() {
222 return ::null_is_fullscreen( m_videoOutput ); 223 return ::null_is_fullscreen( m_videoOutput );
223} 224}
224void Lib::setScaling( bool scale ) { 225void Lib::setScaling( bool scale ) {
225 ::null_set_scaling( m_videoOutput, scale ); 226 ::null_set_scaling( m_videoOutput, scale );
226} 227}
227bool Lib::isScaling() { 228bool Lib::isScaling() {
228 return ::null_is_scaling( m_videoOutput ); 229 return ::null_is_scaling( m_videoOutput );
229} 230}
230void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { 231void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
231 ((Lib*)user_data)->handleXineEvent( t ); 232 ((Lib*)user_data)->handleXineEvent( t );
232} 233}
233void Lib::xine_display_frame( void* user_data, uint8_t *frame, 234void Lib::xine_display_frame( void* user_data, uint8_t *frame,
234 int width, int height, int bytes ) { 235 int width, int height, int bytes ) {
235 236
236 ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); 237 ((Lib*)user_data)->drawFrame( frame, width, height, bytes );
237} 238}
238void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { 239void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
239 if (!m_video ) { 240 if (!m_video ) {
240 qWarning("not showing video now"); 241 qWarning("not showing video now");
241 return; 242 return;
242 } 243 }
243// qWarning("called draw frame %d %d", width, height); 244// qWarning("called draw frame %d %d", width, height);
244 245
245 m_wid->setImage( frame, width, height, bytes ); 246 m_wid->setImage( frame, width, height, bytes );
246// m_wid->repaint(false); 247// m_wid->repaint(false);
247 248
248} 249}
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 51fbb8b..93819f2 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,170 +1,170 @@
1#include <qpe/qpeapplication.h> 1#include <qpe/qpeapplication.h>
2#include <qpe/qlibrary.h> 2#include <qpe/qlibrary.h>
3#include <qpe/resource.h> 3#include <qpe/resource.h>
4#include <qpe/config.h> 4#include <qpe/config.h>
5 5
6#include <qmainwindow.h> 6#include <qmainwindow.h>
7#include <qmessagebox.h> 7#include <qmessagebox.h>
8#include <qwidgetstack.h> 8#include <qwidgetstack.h>
9#include <qfile.h> 9#include <qfile.h>
10 10
11#include "mediaplayer.h" 11#include "mediaplayer.h"
12#include "playlistwidget.h" 12#include "playlistwidget.h"
13#include "audiowidget.h" 13#include "audiowidget.h"
14#include "videowidget.h" 14#include "videowidget.h"
15#include "volumecontrol.h" 15#include "volumecontrol.h"
16 16
17#include "mediaplayerstate.h" 17#include "mediaplayerstate.h"
18 18
19 19
20 20
21extern AudioWidget *audioUI; 21extern AudioWidget *audioUI;
22extern VideoWidget *videoUI; 22extern VideoWidget *videoUI;
23extern PlayListWidget *playList; 23extern PlayListWidget *playList;
24extern MediaPlayerState *mediaPlayerState; 24extern MediaPlayerState *mediaPlayerState;
25 25
26 26
27MediaPlayer::MediaPlayer( QObject *parent, const char *name ) 27MediaPlayer::MediaPlayer( QObject *parent, const char *name )
28 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { 28 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
29 29
30 30
31 xineControl = new XineControl(); 31 xineControl = new XineControl();
32// QPEApplication::grabKeyboard(); // EVIL 32// QPEApplication::grabKeyboard(); // EVIL
33 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 33 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
34 34
35 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); 35 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
36 36
37 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); 37 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) );
38 38
39 connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); 39 connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
40 connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); 40 connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
41 41
42 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 42 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
43 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 43 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
44 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 44 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
45 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 45 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
46 46
47 connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 47 connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
48 connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 48 connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
49 connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 49 connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
50 connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 50 connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
51 51
52 volControl = new VolumeControl; 52 volControl = new VolumeControl;
53 53
54} 54}
55 55
56MediaPlayer::~MediaPlayer() { 56MediaPlayer::~MediaPlayer() {
57 delete xineControl; 57 delete xineControl;
58 delete volControl; 58 delete volControl;
59} 59}
60 60
61void MediaPlayer::pauseCheck( bool b ) { 61void MediaPlayer::pauseCheck( bool b ) {
62 if ( b && !mediaPlayerState->playing() ) { 62 if ( b && !mediaPlayerState->playing() ) {
63 mediaPlayerState->setPaused( FALSE ); 63 mediaPlayerState->setPaused( FALSE );
64 } 64 }
65} 65}
66 66
67void MediaPlayer::play() { 67void MediaPlayer::play() {
68 mediaPlayerState->setPlaying( FALSE ); 68 mediaPlayerState->setPlaying( FALSE );
69 mediaPlayerState->setPlaying( TRUE ); 69 mediaPlayerState->setPlaying( TRUE );
70} 70}
71 71
72void MediaPlayer::setPlaying( bool play ) { 72void MediaPlayer::setPlaying( bool play ) {
73 if ( !play ) { 73 if ( !play ) {
74 mediaPlayerState->setPaused( FALSE ); 74 //mediaPlayerState->setPaused( TRUE );
75 return; 75 return;
76 } 76 }
77 77
78 if ( mediaPlayerState->paused() ) { 78 if ( mediaPlayerState->paused() ) {
79 mediaPlayerState->setPaused( FALSE ); 79 mediaPlayerState->setPaused( FALSE );
80 return; 80 return;
81 } 81 }
82 82
83 const DocLnk *playListCurrent = playList->current(); 83 const DocLnk *playListCurrent = playList->current();
84 if ( playListCurrent != NULL ) { 84 if ( playListCurrent != NULL ) {
85 currentFile = playListCurrent; 85 currentFile = playListCurrent;
86 } 86 }
87 87
88 xineControl->play( currentFile->file() ); 88 xineControl->play( currentFile->file() );
89 89
90 xineControl->length(); 90 xineControl->length();
91 long seconds = mediaPlayerState->length();// 91 long seconds = mediaPlayerState->length();//
92 QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); 92 QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
93 qDebug(time); 93 qDebug(time);
94 94
95 QString tickerText; 95 QString tickerText;
96 if( currentFile->file().left(4) == "http" ) 96 if( currentFile->file().left(4) == "http" )
97 tickerText= tr( " File: " ) + currentFile->name(); 97 tickerText= tr( " File: " ) + currentFile->name();
98 else 98 else
99 tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time; 99 tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
100 100
101// QString fileInfo = mediaPlayerState->curDecoder()->fileInfo(); 101// QString fileInfo = mediaPlayerState->curDecoder()->fileInfo();
102 102
103// if ( !fileInfo.isEmpty() ) 103// if ( !fileInfo.isEmpty() )
104// tickerText += ", " + fileInfo; 104// tickerText += ", " + fileInfo;
105// audioUI->setTickerText( tickerText + "." ); 105// audioUI->setTickerText( tickerText + "." );
106 106
107 audioUI->setTickerText( currentFile->file( ) ); 107 audioUI->setTickerText( currentFile->file( ) );
108 108
109} 109}
110 110
111 111
112void MediaPlayer::prev() { 112void MediaPlayer::prev() {
113 if ( playList->prev() ) { 113 if ( playList->prev() ) {
114 play(); 114 play();
115 } else if ( mediaPlayerState->looping() ) { 115 } else if ( mediaPlayerState->looping() ) {
116 if ( playList->last() ) { 116 if ( playList->last() ) {
117 play(); 117 play();
118 } 118 }
119 } else { 119 } else {
120 mediaPlayerState->setList(); 120 mediaPlayerState->setList();
121 } 121 }
122} 122}
123 123
124 124
125void MediaPlayer::next() { 125void MediaPlayer::next() {
126 if ( playList->next() ) { 126 if ( playList->next() ) {
127 play(); 127 play();
128 } else if ( mediaPlayerState->looping() ) { 128 } else if ( mediaPlayerState->looping() ) {
129 if ( playList->first() ) { 129 if ( playList->first() ) {
130 play(); 130 play();
131 } 131 }
132 } else { 132 } else {
133 mediaPlayerState->setList(); 133 mediaPlayerState->setList();
134 } 134 }
135} 135}
136 136
137 137
138void MediaPlayer::startDecreasingVolume() { 138void MediaPlayer::startDecreasingVolume() {
139 volumeDirection = -1; 139 volumeDirection = -1;
140 startTimer( 100 ); 140 startTimer( 100 );
141 volControl->decVol(2); 141 volControl->decVol(2);
142} 142}
143 143
144 144
145void MediaPlayer::startIncreasingVolume() { 145void MediaPlayer::startIncreasingVolume() {
146 volumeDirection = +1; 146 volumeDirection = +1;
147 startTimer( 100 ); 147 startTimer( 100 );
148 volControl->incVol(2); 148 volControl->incVol(2);
149} 149}
150 150
151 151
152bool drawnOnScreenDisplay = FALSE; 152bool drawnOnScreenDisplay = FALSE;
153unsigned int onScreenDisplayVolume = 0; 153unsigned int onScreenDisplayVolume = 0;
154const int yoff = 110; 154const int yoff = 110;
155 155
156void MediaPlayer::stopChangingVolume() { 156void MediaPlayer::stopChangingVolume() {
157 killTimers(); 157 killTimers();
158 // Get rid of the on-screen display stuff 158 // Get rid of the on-screen display stuff
159 drawnOnScreenDisplay = FALSE; 159 drawnOnScreenDisplay = FALSE;
160 onScreenDisplayVolume = 0; 160 onScreenDisplayVolume = 0;
161 int w=0; 161 int w=0;
162 int h=0; 162 int h=0;
163 if( !xineControl->hasVideo()) { 163 if( !xineControl->hasVideo()) {
164 w = audioUI->width(); 164 w = audioUI->width();
165 h = audioUI->height(); 165 h = audioUI->height();
166 audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); 166 audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
167 } else { 167 } else {
168 w = videoUI->width(); 168 w = videoUI->width();
169 h = videoUI->height(); 169 h = videoUI->height();
170 videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); 170 videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index c210ffb..77e2095 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -592,193 +592,193 @@ void PlayListWidget::saveList() {
592 } 592 }
593 Config config( "OpiePlayer" ); 593 Config config( "OpiePlayer" );
594 config.writeEntry("CurrentPlaylist",filename); 594 config.writeEntry("CurrentPlaylist",filename);
595 setCaption(tr("OpiePlayer: ")+filename); 595 setCaption(tr("OpiePlayer: ")+filename);
596 d->selectedFiles->first(); 596 d->selectedFiles->first();
597 if(fileDlg) { 597 if(fileDlg) {
598 delete fileDlg; 598 delete fileDlg;
599 } 599 }
600} 600}
601 601
602void PlayListWidget::loadList( const DocLnk & lnk) { 602void PlayListWidget::loadList( const DocLnk & lnk) {
603 QString name= lnk.name(); 603 QString name= lnk.name();
604 // qDebug("currentList is "+name); 604 // qDebug("currentList is "+name);
605 if( name.length()>1) { 605 if( name.length()>1) {
606 setCaption("OpiePlayer: "+name); 606 setCaption("OpiePlayer: "+name);
607 // qDebug("load list "+ name+".playlist"); 607 // qDebug("load list "+ name+".playlist");
608 clearList(); 608 clearList();
609 Config cfg( name+".playlist"); 609 Config cfg( name+".playlist");
610 readConfig(cfg); 610 readConfig(cfg);
611 611
612 tabWidget->setCurrentPage(0); 612 tabWidget->setCurrentPage(0);
613 613
614 Config config( "OpiePlayer" ); 614 Config config( "OpiePlayer" );
615 config.writeEntry("CurrentPlaylist", name); 615 config.writeEntry("CurrentPlaylist", name);
616 // d->selectedFiles->first(); 616 // d->selectedFiles->first();
617 } 617 }
618 618
619} 619}
620 620
621void PlayListWidget::setPlaylist( bool shown ) { 621void PlayListWidget::setPlaylist( bool shown ) {
622 if ( shown ) { 622 if ( shown ) {
623 d->playListFrame->show(); 623 d->playListFrame->show();
624 } else { 624 } else {
625 d->playListFrame->hide(); 625 d->playListFrame->hide();
626 } 626 }
627} 627}
628 628
629void PlayListWidget::setView( char view ) { 629void PlayListWidget::setView( char view ) {
630 if ( view == 'l' ) 630 if ( view == 'l' )
631 showMaximized(); 631 showMaximized();
632 else 632 else
633 hide(); 633 hide();
634} 634}
635 635
636void PlayListWidget::addSelected() { 636void PlayListWidget::addSelected() {
637 637
638 Config cfg( "OpiePlayer" ); 638 Config cfg( "OpiePlayer" );
639 cfg.setGroup("PlayList"); 639 cfg.setGroup("PlayList");
640 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 640 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
641// int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 641// int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
642 642
643 switch (tabWidget->currentPageIndex()) { 643 switch (tabWidget->currentPageIndex()) {
644 case 0: //playlist 644 case 0: //playlist
645 break; 645 break;
646 case 1: { //audio 646 case 1: { //audio
647 QListViewItemIterator it( audioView ); 647 QListViewItemIterator it( audioView );
648 // iterate through all items of the listview 648 // iterate through all items of the listview
649 for ( ; it.current(); ++it ) { 649 for ( ; it.current(); ++it ) {
650 if ( it.current()->isSelected() ) { 650 if ( it.current()->isSelected() ) {
651 QListIterator<DocLnk> dit( files.children() ); 651 QListIterator<DocLnk> dit( files.children() );
652 for ( ; dit.current(); ++dit ) { 652 for ( ; dit.current(); ++dit ) {
653 if( dit.current()->name() == it.current()->text(0) ) { 653 if( dit.current()->name() == it.current()->text(0) ) {
654 d->selectedFiles->addToSelection( **dit ); 654 d->selectedFiles->addToSelection( **dit );
655 } 655 }
656 } 656 }
657 audioView->setSelected( it.current(),FALSE); 657 audioView->setSelected( it.current(),FALSE);
658 } 658 }
659 } 659 }
660 tabWidget->setCurrentPage(0); 660 tabWidget->setCurrentPage(0);
661 } 661 }
662 break; 662 break;
663 case 2: { // video 663 case 2: { // video
664 QListViewItemIterator it( videoView ); 664 QListViewItemIterator it( videoView );
665 // iterate through all items of the listview 665 // iterate through all items of the listview
666 for ( ; it.current(); ++it ) { 666 for ( ; it.current(); ++it ) {
667 if ( it.current()->isSelected() ) { 667 if ( it.current()->isSelected() ) {
668 QListIterator<DocLnk> dit( vFiles.children() ); 668 QListIterator<DocLnk> dit( vFiles.children() );
669 for ( ; dit.current(); ++dit ) { 669 for ( ; dit.current(); ++dit ) {
670 if( dit.current()->name() == it.current()->text(0) ) { 670 if( dit.current()->name() == it.current()->text(0) ) {
671 d->selectedFiles->addToSelection( **dit ); 671 d->selectedFiles->addToSelection( **dit );
672 } 672 }
673 } 673 }
674 videoView->setSelected( it.current(),FALSE); 674 videoView->setSelected( it.current(),FALSE);
675 } 675 }
676 } 676 }
677 tabWidget->setCurrentPage(0); 677 tabWidget->setCurrentPage(0);
678 } 678 }
679 break; 679 break;
680 }; 680 };
681} 681}
682 682
683void PlayListWidget::removeSelected() { 683void PlayListWidget::removeSelected() {
684 d->selectedFiles->removeSelected( ); 684 d->selectedFiles->removeSelected( );
685} 685}
686 686
687void PlayListWidget::playIt( QListViewItem *it) { 687void PlayListWidget::playIt( QListViewItem *it) {
688 if(it==NULL) return; 688 // if(it==NULL) return;
689 qDebug("playIt"); 689 qDebug("playIt");
690 mediaPlayerState->setPlaying(FALSE); 690 mediaPlayerState->setPlaying(FALSE);
691 mediaPlayerState->setPlaying(TRUE); 691 mediaPlayerState->setPlaying(TRUE);
692 d->selectedFiles->unSelect(); 692 d->selectedFiles->unSelect();
693} 693}
694 694
695void PlayListWidget::addToSelection( QListViewItem *it) { 695void PlayListWidget::addToSelection( QListViewItem *it) {
696 d->setDocumentUsed = FALSE; 696 d->setDocumentUsed = FALSE;
697 697
698 if(it) { 698 if(it) {
699 switch (tabWidget->currentPageIndex()) { 699 switch (tabWidget->currentPageIndex()) {
700 case 1: { 700 case 1: {
701 QListIterator<DocLnk> dit( files.children() ); 701 QListIterator<DocLnk> dit( files.children() );
702 for ( ; dit.current(); ++dit ) { 702 for ( ; dit.current(); ++dit ) {
703 if( dit.current()->name() == it->text(0)) { 703 if( dit.current()->name() == it->text(0)) {
704 d->selectedFiles->addToSelection( **dit ); 704 d->selectedFiles->addToSelection( **dit );
705 } 705 }
706 } 706 }
707 } 707 }
708 break; 708 break;
709 case 2: { 709 case 2: {
710 QListIterator<DocLnk> dit( vFiles.children() ); 710 QListIterator<DocLnk> dit( vFiles.children() );
711 for ( ; dit.current(); ++dit ) { 711 for ( ; dit.current(); ++dit ) {
712 if( dit.current()->name() == it->text(0)) { 712 if( dit.current()->name() == it->text(0)) {
713 d->selectedFiles->addToSelection( **dit ); 713 d->selectedFiles->addToSelection( **dit );
714 } 714 }
715 } 715 }
716 } 716 }
717 break; 717 break;
718 case 0: 718 case 0:
719 break; 719 break;
720 }; 720 };
721 tabWidget->setCurrentPage(0); 721 tabWidget->setCurrentPage(0);
722 } 722 }
723} 723}
724 724
725void PlayListWidget::tabChanged(QWidget *) { 725void PlayListWidget::tabChanged(QWidget *) {
726 726
727 switch ( tabWidget->currentPageIndex()) { 727 switch ( tabWidget->currentPageIndex()) {
728 case 0: 728 case 0:
729 { 729 {
730 if( !tbDeletePlaylist->isHidden()) 730 if( !tbDeletePlaylist->isHidden())
731 tbDeletePlaylist->hide(); 731 tbDeletePlaylist->hide();
732 d->tbRemoveFromList->setEnabled(TRUE); 732 d->tbRemoveFromList->setEnabled(TRUE);
733 d->tbAddToList->setEnabled(FALSE); 733 d->tbAddToList->setEnabled(FALSE);
734 } 734 }
735 break; 735 break;
736 case 1: 736 case 1:
737 { 737 {
738 audioView->clear(); 738 audioView->clear();
739 populateAudioView(); 739 populateAudioView();
740 740
741 if( !tbDeletePlaylist->isHidden()) 741 if( !tbDeletePlaylist->isHidden())
742 tbDeletePlaylist->hide(); 742 tbDeletePlaylist->hide();
743 d->tbRemoveFromList->setEnabled(FALSE); 743 d->tbRemoveFromList->setEnabled(FALSE);
744 d->tbAddToList->setEnabled(TRUE); 744 d->tbAddToList->setEnabled(TRUE);
745 } 745 }
746 break; 746 break;
747 case 2: 747 case 2:
748 { 748 {
749 videoView->clear(); 749 videoView->clear();
750 populateVideoView(); 750 populateVideoView();
751 if( !tbDeletePlaylist->isHidden()) 751 if( !tbDeletePlaylist->isHidden())
752 tbDeletePlaylist->hide(); 752 tbDeletePlaylist->hide();
753 d->tbRemoveFromList->setEnabled(FALSE); 753 d->tbRemoveFromList->setEnabled(FALSE);
754 d->tbAddToList->setEnabled(TRUE); 754 d->tbAddToList->setEnabled(TRUE);
755 } 755 }
756 break; 756 break;
757 case 3: 757 case 3:
758 { 758 {
759 if( tbDeletePlaylist->isHidden()) 759 if( tbDeletePlaylist->isHidden())
760 tbDeletePlaylist->show(); 760 tbDeletePlaylist->show();
761 playLists->reread(); 761 playLists->reread();
762 } 762 }
763 break; 763 break;
764 }; 764 };
765} 765}
766 766
767void PlayListWidget::btnPlay(bool b) { 767void PlayListWidget::btnPlay(bool b) {
768 768
769// mediaPlayerState->setPlaying(b); 769// mediaPlayerState->setPlaying(b);
770 switch ( tabWidget->currentPageIndex()) { 770 switch ( tabWidget->currentPageIndex()) {
771 case 0: 771 case 0:
772 { 772 {
773 mediaPlayerState->setPlaying(b); 773 mediaPlayerState->setPlaying(b);
774 } 774 }
775 break; 775 break;
776 case 1: 776 case 1:
777 { 777 {
778 addToSelection( audioView->currentItem() ); 778 addToSelection( audioView->currentItem() );
779 mediaPlayerState->setPlaying(b); 779 mediaPlayerState->setPlaying(b);
780 d->selectedFiles->removeSelected( ); 780 d->selectedFiles->removeSelected( );
781 tabWidget->setCurrentPage(1); 781 tabWidget->setCurrentPage(1);
782 d->selectedFiles->unSelect(); 782 d->selectedFiles->unSelect();
783 insanityBool=FALSE; 783 insanityBool=FALSE;
784 }// audioView->clearSelection(); 784 }// audioView->clearSelection();
@@ -1140,146 +1140,146 @@ void PlayListWidget::readm3u(const QString &filename) {
1140 lnk.writeLink(); 1140 lnk.writeLink();
1141 d->selectedFiles->addToSelection( lnk); 1141 d->selectedFiles->addToSelection( lnk);
1142 } 1142 }
1143 i++; 1143 i++;
1144 } 1144 }
1145 } 1145 }
1146 } 1146 }
1147 } 1147 }
1148 f.close(); 1148 f.close();
1149} 1149}
1150 1150
1151void PlayListWidget::writem3u() { 1151void PlayListWidget::writem3u() {
1152 1152
1153 InputDialog *fileDlg; 1153 InputDialog *fileDlg;
1154 fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0); 1154 fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0);
1155 fileDlg->exec(); 1155 fileDlg->exec();
1156 QString filename,list; 1156 QString filename,list;
1157 if( fileDlg->result() == 1 ) { 1157 if( fileDlg->result() == 1 ) {
1158 filename = fileDlg->LineEdit1->text(); 1158 filename = fileDlg->LineEdit1->text();
1159 qDebug(filename); 1159 qDebug(filename);
1160 int noOfFiles = 0; 1160 int noOfFiles = 0;
1161 d->selectedFiles->first(); 1161 d->selectedFiles->first();
1162 do { 1162 do {
1163 // we dont check for existance because of url's 1163 // we dont check for existance because of url's
1164 // qDebug(d->selectedFiles->current()->file()); 1164 // qDebug(d->selectedFiles->current()->file());
1165 list += d->selectedFiles->current()->file()+"\n"; 1165 list += d->selectedFiles->current()->file()+"\n";
1166 noOfFiles++; 1166 noOfFiles++;
1167 } 1167 }
1168 while ( d->selectedFiles->next() ); 1168 while ( d->selectedFiles->next() );
1169 qDebug(list); 1169 qDebug(list);
1170 if(filename.left(1) != "/") 1170 if(filename.left(1) != "/")
1171 filename=QPEApplication::documentDir()+"/"+filename; 1171 filename=QPEApplication::documentDir()+"/"+filename;
1172 if(filename.right(3) != "m3u") 1172 if(filename.right(3) != "m3u")
1173 filename=filename+".m3u"; 1173 filename=filename+".m3u";
1174 1174
1175 QFile f(filename); 1175 QFile f(filename);
1176 f.open(IO_WriteOnly); 1176 f.open(IO_WriteOnly);
1177 f.writeBlock(list, list.length()); 1177 f.writeBlock(list, list.length());
1178 f.close(); 1178 f.close();
1179 } 1179 }
1180 if(fileDlg) delete fileDlg; 1180 if(fileDlg) delete fileDlg;
1181} 1181}
1182 1182
1183void PlayListWidget::readPls(const QString &filename) { 1183void PlayListWidget::readPls(const QString &filename) {
1184 1184
1185 qDebug("pls filename is "+filename); 1185 qDebug("pls filename is "+filename);
1186 QFile f(filename); 1186 QFile f(filename);
1187 1187
1188 if(f.open(IO_ReadOnly)) { 1188 if(f.open(IO_ReadOnly)) {
1189 QTextStream t(&f); 1189 QTextStream t(&f);
1190 QString s;//, first, second; 1190 QString s;//, first, second;
1191 int i=0; 1191 int i=0;
1192 while ( !t.atEnd()) { 1192 while ( !t.atEnd()) {
1193 s=t.readLine(); 1193 s=t.readLine();
1194 if(s.left(4) == "File") { 1194 if(s.left(4) == "File") {
1195 s=s.right(s.length() - 6); 1195 s=s.right(s.length() - 6);
1196 s.replace(QRegExp("%20")," "); 1196 s.replace(QRegExp("%20")," ");
1197 qDebug("adding "+s+" to playlist"); 1197 qDebug("adding "+s+" to playlist");
1198 // numberofentries=2 1198 // numberofentries=2
1199 // File1=http 1199 // File1=http
1200 // Title 1200 // Title
1201 // Length 1201 // Length
1202 // Version 1202 // Version
1203 // File2=http 1203 // File2=http
1204 s=s.replace( QRegExp("\\"),"/"); 1204 s=s.replace( QRegExp("\\"),"/");
1205 DocLnk lnk( s ); 1205 DocLnk lnk( s );
1206 QFileInfo f(s); 1206 QFileInfo f(s);
1207 QString name = f.baseName(); 1207 QString name = f.baseName();
1208 if(name.left(4)=="http") 1208 if(name.left(4)=="http")
1209 name = s.right( s.length() - 7); 1209 name = s.right( s.length() - 7);
1210 else 1210 else
1211 name=s; 1211 name=s;
1212 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); 1212 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
1213 lnk.setName( name); 1213 lnk.setName( name);
1214 if(s.at(s.length()-4) == '.') // if this is probably a file 1214 if(s.at(s.length()-4) == '.') // if this is probably a file
1215 lnk.setFile( s); 1215 lnk.setFile( s);
1216 else { //if its a url 1216 else { //if its a url
1217 if( name.right(1).find('/') == -1) 1217 if( name.right(1).find('/') == -1)
1218 s+="/"; 1218 s+="/";
1219 lnk.setFile( s); 1219 lnk.setFile( s);
1220 } 1220 }
1221 lnk.setType("audio/x-mpegurl"); 1221 lnk.setType("audio/x-mpegurl");
1222 1222
1223 qDebug("DocLnk add "+name); 1223 qDebug("DocLnk add "+name);
1224 d->selectedFiles->addToSelection( lnk); 1224 d->selectedFiles->addToSelection( lnk);
1225 } 1225 }
1226 } 1226 }
1227 i++; 1227 i++;
1228 } 1228 }
1229} 1229}
1230 1230
1231void PlayListWidget::pmViewActivated(int index) { 1231void PlayListWidget::pmViewActivated(int index) {
1232qDebug("%d", index); 1232qDebug("%d", index);
1233switch(index) { 1233switch(index) {
1234 case -16: 1234 case -16:
1235 { 1235 {
1236 1236
1237 mediaPlayerState->toggleFullscreen(); 1237 mediaPlayerState->toggleFullscreen();
1238 bool b=mediaPlayerState->fullscreen(); 1238 bool b=mediaPlayerState->fullscreen();
1239 pmView->setItemChecked( index,b); 1239 pmView->setItemChecked( index,b);
1240 Config cfg( "OpiePlayer" ); 1240 Config cfg( "OpiePlayer" );
1241 cfg.writeEntry("FullScreen", b); 1241 cfg.writeEntry("FullScreen", b);
1242 1242
1243 } 1243 }
1244 break; 1244 break;
1245}; 1245};
1246} 1246}
1247 1247
1248void PlayListWidget::populateSkinsMenu() { 1248void PlayListWidget::populateSkinsMenu() {
1249 int item=0; 1249 int item=0;
1250 defaultSkinIndex=0; 1250 defaultSkinIndex=0;
1251 QString skinName; 1251 QString skinName;
1252 Config cfg( "OpiePlayer" ); 1252 Config cfg( "OpiePlayer" );
1253 cfg.setGroup("Options"); 1253 cfg.setGroup("Options");
1254 QString skin = cfg.readEntry("Skin","default"); 1254 QString skin = cfg.readEntry("Skin","default");
1255 1255
1256 QDir skinsDir(QPEApplication::qpeDir()+"/pics/opieplayer2/skins"); 1256 QDir skinsDir(QPEApplication::qpeDir()+"/pics/opieplayer2/skins");
1257 skinsDir.setFilter( QDir::Dirs); 1257 skinsDir.setFilter( QDir::Dirs);
1258 skinsDir.setSorting(QDir::Name); 1258 skinsDir.setSorting(QDir::Name);
1259 const QFileInfoList *skinslist = skinsDir.entryInfoList(); 1259 const QFileInfoList *skinslist = skinsDir.entryInfoList();
1260 QFileInfoListIterator it( *skinslist ); 1260 QFileInfoListIterator it( *skinslist );
1261 QFileInfo *fi; 1261 QFileInfo *fi;
1262 while ( (fi=it.current()) ) { 1262 while ( (fi=it.current()) ) {
1263 skinName = fi->fileName(); 1263 skinName = fi->fileName();
1264 qDebug( fi->fileName()); 1264 qDebug( fi->fileName());
1265 if( skinName != "." && skinName != ".." && skinName !="CVS") 1265 if( skinName != "." && skinName != ".." && skinName !="CVS")
1266 item = skinsMenu->insertItem( fi->fileName()); 1266 item = skinsMenu->insertItem( fi->fileName());
1267 if( skinName == "default") 1267 if( skinName == "default")
1268 defaultSkinIndex = item; 1268 defaultSkinIndex = item;
1269 if( skinName == skin) 1269 if( skinName == skin)
1270 skinsMenu->setItemChecked( item, TRUE); 1270 skinsMenu->setItemChecked( item, TRUE);
1271 1271
1272 ++it; 1272 ++it;
1273 } 1273 }
1274} 1274}
1275 1275
1276void PlayListWidget::skinsMenuActivated(int item) { 1276void PlayListWidget::skinsMenuActivated(int item) {
1277 for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { 1277 for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) {
1278 skinsMenu->setItemChecked( i, FALSE); 1278 skinsMenu->setItemChecked( i, FALSE);
1279 } 1279 }
1280 skinsMenu->setItemChecked( item, TRUE); 1280 skinsMenu->setItemChecked( item, TRUE);
1281 1281
1282 Config cfg( "OpiePlayer" ); 1282 Config cfg( "OpiePlayer" );
1283 cfg.setGroup("Options"); 1283 cfg.setGroup("Options");
1284 cfg.writeEntry("Skin", skinsMenu->text( item)); 1284 cfg.writeEntry("Skin", skinsMenu->text( item));
1285} 1285}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 17112a2..8fd2743 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -23,178 +23,178 @@
23++=   -.     .`     .: details. 23++=   -.     .`     .: details.
24 :     =  ...= . :.=- 24 :     =  ...= . :.=-
25 -.   .:....=;==+<; You should have received a copy of the GNU 25 -.   .:....=;==+<; You should have received a copy of the GNU
26  -_. . .   )=.  = Library General Public License along with 26  -_. . .   )=.  = Library General Public License along with
27    --        :-=` this library; see the file COPYING.LIB. 27    --        :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation, 28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330, 29 Inc., 59 Temple Place - Suite 330,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
31 31
32*/ 32*/
33 33
34 34
35#include <qtimer.h> 35#include <qtimer.h>
36#include <qpe/qcopenvelope_qws.h> 36#include <qpe/qcopenvelope_qws.h>
37#include <qpe/qpeapplication.h> 37#include <qpe/qpeapplication.h>
38#include "xinecontrol.h" 38#include "xinecontrol.h"
39#include "mediaplayerstate.h" 39#include "mediaplayerstate.h"
40#include "videowidget.h" 40#include "videowidget.h"
41 41
42extern MediaPlayerState *mediaPlayerState; 42extern MediaPlayerState *mediaPlayerState;
43extern VideoWidget *videoUI; 43extern VideoWidget *videoUI;
44XineControl::XineControl( QObject *parent, const char *name ) 44XineControl::XineControl( QObject *parent, const char *name )
45 : QObject( parent, name ) { 45 : QObject( parent, name ) {
46 libXine = new XINE::Lib(videoUI->vidWidget() ); 46 libXine = new XINE::Lib(videoUI->vidWidget() );
47 47
48 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); 48 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & )));
49 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 49 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
50 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); 50 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
51 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 51 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
52 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 52 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
53 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 53 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
54 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); 54 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
55 55
56 disabledSuspendScreenSaver = FALSE; 56 disabledSuspendScreenSaver = FALSE;
57} 57}
58 58
59XineControl::~XineControl() { 59XineControl::~XineControl() {
60#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 60#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
61 if ( disabledSuspendScreenSaver ) { 61 if ( disabledSuspendScreenSaver ) {
62 disabledSuspendScreenSaver = FALSE; 62 disabledSuspendScreenSaver = FALSE;
63 // Re-enable the suspend mode 63 // Re-enable the suspend mode
64 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 64 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
65 } 65 }
66#endif 66#endif
67 delete libXine; 67 delete libXine;
68} 68}
69 69
70void XineControl::play( const QString& fileName ) { 70void XineControl::play( const QString& fileName ) {
71 hasVideoChannel=FALSE; 71 hasVideoChannel=FALSE;
72 hasAudioChannel=FALSE; 72 hasAudioChannel=FALSE;
73 m_fileName = fileName; 73 m_fileName = fileName;
74 libXine->play( fileName ); 74 libXine->play( fileName );
75 mediaPlayerState->setPlaying( true ); 75 mediaPlayerState->setPlaying( true );
76 // default to audio view until we know how to handle video 76 // default to audio view until we know how to handle video
77 // MediaDetect mdetect; 77 // MediaDetect mdetect;
78 char whichGui = mdetect.videoOrAudio( fileName ); 78 char whichGui = mdetect.videoOrAudio( fileName );
79 if (whichGui == 'f') { 79 if (whichGui == 'f') {
80 qDebug("Nicht erkannter Dateityp"); 80 qDebug("Nicht erkannter Dateityp");
81 return; 81 return;
82 } 82 }
83 83
84 if (whichGui == 'a') { 84 if (whichGui == 'a') {
85 libXine->setShowVideo( false ); 85 libXine->setShowVideo( false );
86 hasAudioChannel=TRUE; 86 hasAudioChannel=TRUE;
87 } else { 87 } else {
88 libXine->setShowVideo( true ); 88 libXine->setShowVideo( true );
89 hasVideoChannel=TRUE; 89 hasVideoChannel=TRUE;
90 } 90 }
91 91
92 // determine if slider is shown 92 // determine if slider is shown
93 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); 93 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
94 mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); 94 mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
95 // which gui (video / audio) 95 // which gui (video / audio)
96 mediaPlayerState->setView( whichGui ); 96 mediaPlayerState->setView( whichGui );
97 97
98#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 98#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
99 if ( !disabledSuspendScreenSaver ) { 99 if ( !disabledSuspendScreenSaver ) {
100 disabledSuspendScreenSaver = TRUE; 100 disabledSuspendScreenSaver = TRUE;
101 // Stop the screen from blanking and power saving state 101 // Stop the screen from blanking and power saving state
102 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 102 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
103 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); 103 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend );
104 } 104 }
105#endif 105#endif
106 106
107 length(); 107 length();
108 position(); 108 position();
109} 109}
110 110
111void XineControl::nextMedia() { 111void XineControl::nextMedia() {
112 mediaPlayerState->setNext(); 112 mediaPlayerState->setNext();
113} 113}
114 114
115void XineControl::stop( bool isSet ) { 115void XineControl::stop( bool isSet ) {
116 if ( !isSet) { 116 if ( !isSet) {
117 libXine->stop( ); 117 libXine->stop( );
118 mediaPlayerState->setList(); 118 mediaPlayerState->setList();
119 //mediaPlayerState->setPlaying( false ); 119 // mediaPlayerState->setPlaying( false );
120 120
121#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 121#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
122 if ( disabledSuspendScreenSaver ) { 122 if ( disabledSuspendScreenSaver ) {
123 disabledSuspendScreenSaver = FALSE; 123 disabledSuspendScreenSaver = FALSE;
124 // Re-enable the suspend mode 124 // Re-enable the suspend mode
125 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 125 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
126 } 126 }
127#endif 127#endif
128 128
129 } else { 129 } else {
130 // play again 130 // play again
131 } 131 }
132} 132}
133 133
134/** 134/**
135 * Pause playback 135 * Pause playback
136 * @isSet 136 * @isSet
137 */ 137 */
138void XineControl::pause( bool isSet) { 138void XineControl::pause( bool isSet) {
139 if (isSet) { 139 if (isSet) {
140 libXine->pause(); 140 libXine->pause();
141 } else { 141 } else {
142 libXine->play( m_fileName, 0, m_currentTime); 142 libXine->play( m_fileName, 0, m_currentTime);
143 } 143 }
144} 144}
145 145
146 146
147/** 147/**
148 * get current time in playback 148 * get current time in playback
149 */ 149 */
150long XineControl::currentTime() { 150long XineControl::currentTime() {
151 // todo: jede sekunde überprüfen 151 // todo: jede sekunde überprüfen
152 m_currentTime = libXine->currentTime(); 152 m_currentTime = libXine->currentTime();
153 return m_currentTime; 153 return m_currentTime;
154 QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); 154 QTimer::singleShot( 1000, this, SLOT( currentTime() ) );
155} 155}
156 156
157/** 157/**
158 * Set the length of the media file 158 * Set the length of the media file
159 */ 159 */
160void XineControl::length() { 160void XineControl::length() {
161 m_length = libXine->length(); 161 m_length = libXine->length();
162 mediaPlayerState->setLength( m_length ); 162 mediaPlayerState->setLength( m_length );
163} 163}
164 164
165 165
166/** 166/**
167 * Reports the position the xine backend is at right now 167 * Reports the position the xine backend is at right now
168 * @return long the postion in seconds 168 * @return long the postion in seconds
169 */ 169 */
170long XineControl::position() { 170long XineControl::position() {
171 m_position = ( currentTime() ); 171 m_position = ( currentTime() );
172 mediaPlayerState->updatePosition( m_position ); 172 mediaPlayerState->updatePosition( m_position );
173 long emitPos = (long)m_position; 173 long emitPos = (long)m_position;
174 emit positionChanged( emitPos ); 174 emit positionChanged( emitPos );
175 if(mediaPlayerState->isPlaying) 175 if(mediaPlayerState->isPlaying)
176 // needs to be stopped the media is stopped 176 // needs to be stopped the media is stopped
177 QTimer::singleShot( 1000, this, SLOT( position() ) ); 177 QTimer::singleShot( 1000, this, SLOT( position() ) );
178// qDebug("POSITION : %d", m_position); 178// qDebug("POSITION : %d", m_position);
179 return m_position; 179 return m_position;
180} 180}
181 181
182/** 182/**
183 * Set videoplayback to fullscreen 183 * Set videoplayback to fullscreen
184 * @param isSet 184 * @param isSet
185 */ 185 */
186void XineControl::setFullscreen( bool isSet ) { 186void XineControl::setFullscreen( bool isSet ) {
187 libXine->showVideoFullScreen( isSet); 187 libXine->showVideoFullScreen( isSet);
188} 188}
189 189
190/** 190/**
191 * Seek to a position in the track 191 * Seek to a position in the track
192 * @param second the second to jump to 192 * @param second the second to jump to
193 */ 193 */
194void XineControl::seekTo( long second ) { 194void XineControl::seekTo( long second ) {
195 libXine->play( m_fileName , 0, (int)second ); 195 libXine->play( m_fileName , 0, (int)second );
196} 196}
197 197
198void XineControl::videoResized ( const QSize &s ) { 198void XineControl::videoResized ( const QSize &s ) {
199 libXine-> resize ( s ); 199 libXine-> resize ( s );
200} 200}