summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp25
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp39
-rw-r--r--noncore/multimedia/opieplayer2/lib.h28
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp79
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.h32
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp109
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h14
8 files changed, 229 insertions, 101 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 620c71f..a6fd334 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -58,7 +58,7 @@ static const int yo = 22; // movable y offset
58 58
59Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { 59Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) {
60 setFrameStyle( WinPanel | Sunken ); 60 setFrameStyle( WinPanel | Sunken );
61 setText( "No Song" ); 61 //setText( "No Song" );
62} 62}
63 63
64Ticker::~Ticker() { 64Ticker::~Ticker() {
@@ -460,20 +460,15 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
460 switch (i) { 460 switch (i) {
461 case AudioPlay: 461 case AudioPlay:
462 if( mediaPlayerState->isPaused ) { 462 if( mediaPlayerState->isPaused ) {
463// setToggleButton( i, FALSE );
464 mediaPlayerState->setPaused( FALSE ); 463 mediaPlayerState->setPaused( FALSE );
465 return; 464 return;
466 } else if( !mediaPlayerState->isPaused ) { 465 } else if( !mediaPlayerState->isPaused ) {
467// setToggleButton( i, TRUE );
468 mediaPlayerState->setPaused( TRUE ); 466 mediaPlayerState->setPaused( TRUE );
469 return; 467 return;
470 } else {
471 // setToggleButton( i, TRUE );
472 // mediaPlayerState->setPlaying( videoButtons[i].isDown );
473 } 468 }
474 case AudioStop: mediaPlayerState->setPlaying(FALSE); return; 469 case AudioStop: mediaPlayerState->setPlaying(FALSE); return;
475 case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; 470 case AudioNext: if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return;
476 case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; 471 case AudioPrevious: if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return;
477 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; 472 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return;
478 case AudioVolumeUp: emit moreReleased(); return; 473 case AudioVolumeUp: emit moreReleased(); return;
479 case AudioVolumeDown: emit lessReleased(); return; 474 case AudioVolumeDown: emit lessReleased(); return;
@@ -508,7 +503,7 @@ void AudioWidget::closeEvent( QCloseEvent* ) {
508} 503}
509 504
510 505
511void AudioWidget::paintEvent( QPaintEvent * pe) { 506void AudioWidget::paintEvent( QPaintEvent * pe ) {
512 if ( !pe->erased() ) { 507 if ( !pe->erased() ) {
513 // Combine with background and double buffer 508 // Combine with background and double buffer
514 QPixmap pix( pe->rect().size() ); 509 QPixmap pix( pe->rect().size() );
@@ -580,18 +575,6 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
580 // toggleButton(4); 575 // toggleButton(4);
581 break; 576 break;
582 case Key_Escape: { 577 case Key_Escape: {
583/*
584 * author pleas tell me where the i come from .-)
585 #if defined(QT_QWS_IPAQ)
586 if( mediaPlayerState->isPaused ) {
587 setToggleButton( i, FALSE );
588 mediaPlayerState->setPaused( FALSE );
589 } else if( !mediaPlayerState->isPaused ) {
590 setToggleButton( i, TRUE );
591 mediaPlayerState->setPaused( TRUE );
592 }
593#endif
594*/
595 } 578 }
596 break; 579 break;
597 580
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 4021d4a..85030de 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -150,7 +150,9 @@ int Lib::subVersion() {
150 150
151int Lib::play( const QString& fileName, int startPos, int start_time ) { 151int Lib::play( const QString& fileName, int startPos, int start_time ) {
152 QString str = fileName.stripWhiteSpace(); 152 QString str = fileName.stripWhiteSpace();
153 xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ); 153 if ( !xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ) ) {
154 return 0;
155 }
154 return xine_play( m_xine, startPos, start_time); 156 return xine_play( m_xine, startPos, start_time);
155} 157}
156 158
@@ -191,16 +193,22 @@ int Lib::length() {
191} 193}
192 194
193bool Lib::isSeekable() { 195bool Lib::isSeekable() {
194 return xine_get_stream_info ( m_xine, XINE_STREAM_INFO_SEEKABLE ); 196 return xine_get_stream_info( m_xine, XINE_STREAM_INFO_SEEKABLE );
197}
198
199void Lib::seekTo( int time ) {
200// xine_trick_mode ( m_xine, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
201 xine_play( m_xine, 0, time );
195} 202}
196 203
204
197Frame Lib::currentFrame() { 205Frame Lib::currentFrame() {
198 Frame frame; 206 Frame frame;
199 return frame; 207 return frame;
200}; 208};
201 209
202QString Lib::metaInfo() { 210QString Lib::metaInfo( int number) {
203 xine_get_meta_info( m_xine, 0 ); 211 return xine_get_meta_info( m_xine, number );
204} 212}
205 213
206int Lib::error() { 214int Lib::error() {
@@ -216,13 +224,27 @@ void Lib::handleXineEvent( xine_event_t* t ) {
216 224
217void Lib::setShowVideo( bool video ) { 225void Lib::setShowVideo( bool video ) {
218 m_video = video; 226 m_video = video;
219 ::null_set_show_video( m_videoOutput, video ); 227 ::null_set_show_video( m_videoOutput, video );
220} 228}
221 229
222bool Lib::isShowingVideo() { 230bool Lib::isShowingVideo() {
223 return ::null_is_showing_video( m_videoOutput ); 231 return ::null_is_showing_video( m_videoOutput );
224} 232}
225 233
234bool Lib::hasVideo() {
235 //looks like it is not implemented yet
236 //return xine_get_stream_info( m_xine, XINE_STREAM_INFO_VIDEO_CHANNELS );
237 // ugly hack until xine is ready, look for the width of the video
238 int test = xine_get_stream_info( m_xine, 2 );
239 if( test > 0 ) {
240 // qDebug( QString(" has video: %1").arg( test ) );
241 return true;
242 } else {
243 //qDebug ( "does not have video ");
244 return false;
245 }
246}
247
226void Lib::showVideoFullScreen( bool fullScreen ) { 248void Lib::showVideoFullScreen( bool fullScreen ) {
227 ::null_set_fullscreen( m_videoOutput, fullScreen ); 249 ::null_set_fullscreen( m_videoOutput, fullScreen );
228} 250}
@@ -232,7 +254,7 @@ bool Lib::isVideoFullScreen() {
232} 254}
233 255
234void Lib::setScaling( bool scale ) { 256void Lib::setScaling( bool scale ) {
235 ::null_set_scaling( m_videoOutput, scale ); 257 ::null_set_scaling( m_videoOutput, scale );
236} 258}
237 259
238void Lib::setGamma( int value ) { 260void Lib::setGamma( int value ) {
@@ -250,7 +272,7 @@ void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
250 272
251void Lib::xine_display_frame( void* user_data, uint8_t *frame, 273void Lib::xine_display_frame( void* user_data, uint8_t *frame,
252 int width, int height, int bytes ) { 274 int width, int height, int bytes ) {
253 ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); 275 ( (Lib*)user_data)->drawFrame( frame, width, height, bytes );
254} 276}
255 277
256void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { 278void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
@@ -258,8 +280,5 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
258 qWarning("not showing video now"); 280 qWarning("not showing video now");
259 return; 281 return;
260 } 282 }
261
262// qWarning( "called draw frame %d %d", width, height );
263
264 m_wid-> setVideoFrame ( frame, width, height, bytes ); 283 m_wid-> setVideoFrame ( frame, width, height, bytes );
265} 284}
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 29adc4d..6cdd9c6 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -117,9 +117,18 @@ namespace XINE {
117 117
118 /** 118 /**
119 * Get the meta info (like author etc) from the stream 119 * Get the meta info (like author etc) from the stream
120 * 120 * XINE_META_INFO_TITLE 0
121 * XINE_META_INFO_COMMENT 1
122 * XINE_META_INFO_ARTIST 2
123 * XINE_META_INFO_GENRE 3
124 * XINE_META_INFO_ALBUM 4
125 * XINE_META_INFO_YEAR 5
126 * XINE_META_INFO_VIDEOCODEC 6
127 * XINE_META_INFO_AUDIOCODEC 7
128 * XINE_META_INFO_SYSTEMLAYER 8
129 * XINE_META_INFO_INPUT_PLUGIN 9
121 */ 130 */
122 QString metaInfo() ; 131 QString metaInfo( int number );
123 132
124 /** 133 /**
125 * 134 *
@@ -127,6 +136,17 @@ namespace XINE {
127 bool isScaling(); 136 bool isScaling();
128 137
129 /** 138 /**
139 * seek to a position
140 */
141 void seekTo( int time );
142
143 /**
144 *
145 * @return is media stream has video
146 */
147 bool hasVideo();
148
149 /**
130 * 150 *
131 */ 151 */
132 void setScaling( bool ); 152 void setScaling( bool );
@@ -144,6 +164,10 @@ namespace XINE {
144 164
145 /** 165 /**
146 * Returns the error code 166 * Returns the error code
167 * XINE_ERROR_NONE 0
168 * XINE_ERROR_NO_INPUT_PLUGIN 1
169 * XINE_ERROR_NO_DEMUXER_PLUGIN 2
170 * XINE_ERROR_DEMUXER_FAILED 3
147 */ 171 */
148 int error() /*const*/; 172 int error() /*const*/;
149 173
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 553e3c1..8da7f73 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -36,7 +36,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
36 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { 36 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
37 37
38 playList->setCaption(tr("OpiePlayer: Initializating")); 38 playList->setCaption(tr("OpiePlayer: Initializating"));
39 39
40 qApp->processEvents(); 40 qApp->processEvents();
41 // QPEApplication::grabKeyboard(); // EVIL 41 // QPEApplication::grabKeyboard(); // EVIL
42 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 42 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
@@ -100,37 +100,50 @@ void MediaPlayer::setPlaying( bool play ) {
100 fileName = currentFile->name(); 100 fileName = currentFile->name();
101 long seconds = mediaPlayerState->length();// 101 long seconds = mediaPlayerState->length();//
102 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); 102 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
103 qDebug(time); 103 //qDebug(time);
104 104
105 } else { //if playing in file list.. play in a different way 105 } else {
106 // random and looping settings enabled causes problems here, 106 //if playing in file list.. play in a different way
107 // since there is no selected file in the playlist, but a selected file in the file list, 107 // random and looping settings enabled causes problems here,
108 // so we remember and shutoff 108 // since there is no selected file in the playlist, but a selected file in the file list,
109 // so we remember and shutoff
109 l = mediaPlayerState->looping(); 110 l = mediaPlayerState->looping();
110 if(l) 111 if(l) {
111 mediaPlayerState->setLooping( false ); 112 mediaPlayerState->setLooping( false );
113 }
112 r = mediaPlayerState->shuffled(); 114 r = mediaPlayerState->shuffled();
113 mediaPlayerState->setShuffled(false); 115 mediaPlayerState->setShuffled( false );
114 116
115 fileName = playList->currentFileListPathName(); 117 fileName = playList->currentFileListPathName();
116 xineControl->play( fileName); 118 xineControl->play( fileName );
117 long seconds = mediaPlayerState->length();// 119 long seconds = mediaPlayerState->length();
118 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); 120 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
119 qDebug(time); 121 //qDebug(time);
120 if( fileName.left(4) != "http" ) 122 if( fileName.left(4) != "http" ) {
121 fileName = QFileInfo( fileName).baseName(); 123 fileName = QFileInfo( fileName ).baseName();
124 }
122 125
123 } 126 }
124 if( fileName.left(4) == "http" ) 127
125 tickerText= tr( " File: " ) + fileName; 128 if( fileName.left(4) == "http" ) {
126 else 129 if ( xineControl->getMetaInfo().isEmpty() ) {
127 tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time; 130 tickerText = tr( " File: " ) + fileName;
131 } else {
132 tickerText = xineControl->getMetaInfo();
133 }
134 } else {
135 if ( xineControl->getMetaInfo().isEmpty() ) {
136 tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " ";
137 } else {
138 tickerText = xineControl->getMetaInfo() + " Length: " + time + " ";
139 }
140 }
128 audioUI->setTickerText( tickerText ); 141 audioUI->setTickerText( tickerText );
129} 142}
130 143
131 144
132void MediaPlayer::prev() { 145void MediaPlayer::prev() {
133 if(playList->whichList() == 0) { //if using the playlist 146 if( playList->whichList() == 0 ) { //if using the playlist
134 if ( playList->prev() ) { 147 if ( playList->prev() ) {
135 play(); 148 play();
136 } else if ( mediaPlayerState->looping() ) { 149 } else if ( mediaPlayerState->looping() ) {
@@ -192,23 +205,23 @@ void MediaPlayer::stopChangingVolume() {
192 onScreenDisplayVolume = 0; 205 onScreenDisplayVolume = 0;
193 int w=0; 206 int w=0;
194 int h=0; 207 int h=0;
195 if( !xineControl->hasVideo()) { 208 if( !xineControl->hasVideo() ) {
196 w = audioUI->width(); 209 w = audioUI->width();
197 h = audioUI->height(); 210 h = audioUI->height();
198 audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); 211 audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
199 } else { 212 } else {
200 w = videoUI->width(); 213 w = videoUI->width();
201 h = videoUI->height(); 214 h = videoUI->height();
202 videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); 215 videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
203 } 216 }
204} 217}
205 218
206 219
207void MediaPlayer::timerEvent( QTimerEvent * ) { 220void MediaPlayer::timerEvent( QTimerEvent * ) {
208 if ( volumeDirection == +1 ) { 221 if ( volumeDirection == +1 ) {
209 volControl->incVol(2); 222 volControl->incVol( 2 );
210 } else if ( volumeDirection == -1 ) { 223 } else if ( volumeDirection == -1 ) {
211 volControl->decVol(2); 224 volControl->decVol( 2 );
212 } 225 }
213 226
214 227
@@ -223,13 +236,13 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
223 } 236 }
224 237
225 int w=0; int h=0; 238 int w=0; int h=0;
226 if( !xineControl->hasVideo()) { 239 if( !xineControl->hasVideo() ) {
227 w = audioUI->width(); 240 w = audioUI->width();
228 h = audioUI->height(); 241 h = audioUI->height();
229 242
230 if ( drawnOnScreenDisplay ) { 243 if ( drawnOnScreenDisplay ) {
231 if ( onScreenDisplayVolume > v ) { 244 if ( onScreenDisplayVolume > v ) {
232 audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); 245 audioUI->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
233 } 246 }
234 } 247 }
235 drawnOnScreenDisplay = TRUE; 248 drawnOnScreenDisplay = TRUE;
@@ -246,9 +259,9 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
246 259
247 for ( unsigned int i = 0; i < 10; i++ ) { 260 for ( unsigned int i = 0; i < 10; i++ ) {
248 if ( v > i ) { 261 if ( v > i ) {
249 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); 262 p.drawRect( ( w - 200 ) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
250 } else { 263 } else {
251 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); 264 p.drawRect( ( w - 200 ) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
252 } 265 }
253 } 266 }
254 } else { 267 } else {
@@ -257,7 +270,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
257 270
258 if ( drawnOnScreenDisplay ) { 271 if ( drawnOnScreenDisplay ) {
259 if ( onScreenDisplayVolume > v ) { 272 if ( onScreenDisplayVolume > v ) {
260 videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); 273 videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
261 } 274 }
262 } 275 }
263 drawnOnScreenDisplay = TRUE; 276 drawnOnScreenDisplay = TRUE;
@@ -270,7 +283,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
270 f.setPixelSize( 20 ); 283 f.setPixelSize( 20 );
271 f.setBold( TRUE ); 284 f.setBold( TRUE );
272 p.setFont( f ); 285 p.setFont( f );
273 p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") ); 286 p.drawText( (w - 200) / 2, h - yoff + 20, tr( "Volume" ) );
274 287
275 for ( unsigned int i = 0; i < 10; i++ ) { 288 for ( unsigned int i = 0; i < 10; i++ ) {
276 if ( v > i ) { 289 if ( v > i ) {
@@ -327,7 +340,7 @@ void MediaPlayer::cleanUp() {// this happens on closing
327 Config cfg( "OpiePlayer" ); 340 Config cfg( "OpiePlayer" );
328 mediaPlayerState->writeConfig( cfg ); 341 mediaPlayerState->writeConfig( cfg );
329 playList->writeConfig( cfg ); 342 playList->writeConfig( cfg );
330 343
331// QPEApplication::grabKeyboard(); 344// QPEApplication::grabKeyboard();
332// QPEApplication::ungrabKeyboard(); 345// QPEApplication::ungrabKeyboard();
333} 346}
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 05be128..131db33 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -1,3 +1,35 @@
1 /*
2                This file is part of the Opie Project
3
4              Copyright (c) 2002 Max Reiss <harlekin@handhelds.org>
5 Copyright (c) 2002 LJP <>
6 Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
7 =.
8 .=l.
9           .>+-=
10 _;:,     .>    :=|. This program is free software; you can
11.> <`_,   >  .   <= redistribute it and/or modify it under
12:`=1 )Y*s>-.--   : the terms of the GNU General Public
13.="- .-=="i,     .._ License as published by the Free Software
14 - .   .-<_>     .<> Foundation; either version 2 of the License,
15     ._= =}       : or (at your option) any later version.
16    .%`+i>       _;_.
17    .i_,=:_.      -<s. This program is distributed in the hope that
18     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
19    : ..    .:,     . . . without even the implied warranty of
20    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
21  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
22..}^=.=       =       ; Library General Public License for more
23++=   -.     .`     .: details.
24 :     =  ...= . :.=-
25 -.   .:....=;==+<; You should have received a copy of the GNU
26  -_. . .   )=.  = Library General Public License along with
27    --        :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330,
30 Boston, MA 02111-1307, USA.
31
32*/
1 33
2#ifndef MEDIA_PLAYER_H 34#ifndef MEDIA_PLAYER_H
3#define MEDIA_PLAYER_H 35#define MEDIA_PLAYER_H
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 1b687a3..619d36d 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -2,12 +2,12 @@ TEMPLATE = app
2#CONFIG = qt warn_on release 2#CONFIG = qt warn_on release
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\ 5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ 6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
7 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ 7 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
8 alphablend.h yuv2rgb.h 8 alphablend.h yuv2rgb.h
9SOURCES = main.cpp \ 9SOURCES = main.cpp \
10 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\ 10 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
11 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ 11 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
12 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ 12 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
13 playlistwidgetgui.cpp\ 13 playlistwidgetgui.cpp\
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index fabc9a5..c22822c 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -33,6 +33,7 @@
33 33
34 34
35#include <qtimer.h> 35#include <qtimer.h>
36#include <qmessagebox.h>
36#include <qpe/qcopenvelope_qws.h> 37#include <qpe/qcopenvelope_qws.h>
37#include <qpe/qpeapplication.h> 38#include <qpe/qpeapplication.h>
38#include "xinecontrol.h" 39#include "xinecontrol.h"
@@ -43,16 +44,17 @@ extern MediaPlayerState *mediaPlayerState;
43extern VideoWidget *videoUI; 44extern VideoWidget *videoUI;
44XineControl::XineControl( QObject *parent, const char *name ) 45XineControl::XineControl( QObject *parent, const char *name )
45 : QObject( parent, name ) { 46 : QObject( parent, name ) {
47
46 libXine = new XINE::Lib(videoUI->vidWidget() ); 48 libXine = new XINE::Lib(videoUI->vidWidget() );
47 49
48 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); 50 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) );
49 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 51 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) );
50 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); 52 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
51 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 53 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
52 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 54 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
53 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 55 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
54 connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); 56 connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) );
55 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); 57 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
56 58
57 disabledSuspendScreenSaver = FALSE; 59 disabledSuspendScreenSaver = FALSE;
58} 60}
@@ -62,44 +64,48 @@ XineControl::~XineControl() {
62 if ( disabledSuspendScreenSaver ) { 64 if ( disabledSuspendScreenSaver ) {
63 disabledSuspendScreenSaver = FALSE; 65 disabledSuspendScreenSaver = FALSE;
64 // Re-enable the suspend mode 66 // Re-enable the suspend mode
65 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 67 QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
66 } 68 }
67#endif 69#endif
68 delete libXine; 70 delete libXine;
69} 71}
70 72
71void XineControl::play( const QString& fileName ) { 73void XineControl::play( const QString& fileName ) {
72 hasVideoChannel=FALSE; 74 hasVideoChannel = FALSE;
73 hasAudioChannel=FALSE; 75 hasAudioChannel = FALSE;
74 m_fileName = fileName; 76 m_fileName = fileName;
75 77
76 //qDebug("<<FILENAME: " + fileName + ">>>>"); 78 //qDebug("<<FILENAME: " + fileName + ">>>>");
77 79
78 libXine->play( fileName ); 80 if ( !libXine->play( fileName ) ) {
79 mediaPlayerState->setPlaying( true ); 81 QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() );
80 char whichGui = mdetect.videoOrAudio( fileName );
81 if (whichGui == 'f') {
82 qDebug("Nicht erkannter Dateityp");
83 return; 82 return;
84 } 83 }
85 if (whichGui == 'a') { 84 mediaPlayerState->setPlaying( true );
85
86 char whichGui;
87 // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) );
88 if ( !libXine->hasVideo() ) {
89 whichGui = 'a';
90 qDebug("HAS AUDIO");
86 libXine->setShowVideo( false ); 91 libXine->setShowVideo( false );
87 hasAudioChannel=TRUE; 92 hasAudioChannel = TRUE;
88 } else { 93 } else {
94 whichGui = 'v';
95 qDebug("HAS VIDEO");
89 libXine->setShowVideo( true ); 96 libXine->setShowVideo( true );
90 hasVideoChannel=TRUE; 97 hasVideoChannel = TRUE;
91 } 98 }
92 // determine if slider is shown 99 // determine if slider is shown
93 mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); 100 mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
94 // which gui (video / audio) 101 // which gui (video / audio)
95 mediaPlayerState->setView( whichGui ); 102 mediaPlayerState->setView( whichGui );
96 103
97
98#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 104#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
99 if ( !disabledSuspendScreenSaver ) { 105 if ( !disabledSuspendScreenSaver ) {
100 disabledSuspendScreenSaver = TRUE; 106 disabledSuspendScreenSaver = TRUE;
101 // Stop the screen from blanking and power saving state 107 // Stop the screen from blanking and power saving state
102 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 108 QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" )
103 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); 109 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend );
104 } 110 }
105#endif 111#endif
@@ -117,17 +123,16 @@ void XineControl::setGamma( int value ) {
117} 123}
118 124
119void XineControl::stop( bool isSet ) { 125void XineControl::stop( bool isSet ) {
120 if ( !isSet) { 126 if ( !isSet ) {
121 libXine->stop( ); 127 libXine->stop();
122 128
123#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 129#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
124 if ( disabledSuspendScreenSaver ) { 130 if ( disabledSuspendScreenSaver ) {
125 disabledSuspendScreenSaver = FALSE; 131 disabledSuspendScreenSaver = FALSE;
126 // Re-enable the suspend mode 132 // Re-enable the suspend mode
127 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 133 QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
128 } 134 }
129#endif 135#endif
130
131 } 136 }
132} 137}
133 138
@@ -136,10 +141,10 @@ void XineControl::stop( bool isSet ) {
136 * @isSet 141 * @isSet
137 */ 142 */
138void XineControl::pause( bool isSet) { 143void XineControl::pause( bool isSet) {
139 if (isSet) { 144 if ( isSet ) {
140 libXine->pause(); 145 libXine->pause();
141 } else { 146 } else {
142 libXine->play( m_fileName, 0, m_currentTime); 147 libXine->play( m_fileName, 0, m_currentTime );
143 } 148 }
144} 149}
145 150
@@ -149,7 +154,7 @@ void XineControl::pause( bool isSet) {
149 */ 154 */
150long XineControl::currentTime() { 155long XineControl::currentTime() {
151 // todo: jede sekunde überprüfen 156 // todo: jede sekunde überprüfen
152 m_currentTime = libXine->currentTime(); 157 m_currentTime = libXine->currentTime();
153 return m_currentTime; 158 return m_currentTime;
154 QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); 159 QTimer::singleShot( 1000, this, SLOT( currentTime() ) );
155} 160}
@@ -168,14 +173,15 @@ void XineControl::length() {
168 * @return long the postion in seconds 173 * @return long the postion in seconds
169 */ 174 */
170long XineControl::position() { 175long XineControl::position() {
171 m_position = ( currentTime() ); 176 m_position = ( currentTime() );
172 mediaPlayerState->updatePosition( m_position ); 177 mediaPlayerState->updatePosition( m_position );
173 long emitPos = (long)m_position; 178 long emitPos = (long)m_position;
174 emit positionChanged( emitPos ); 179 emit positionChanged( emitPos );
175 if(mediaPlayerState->isPlaying) 180 if( mediaPlayerState->isPlaying ) {
176 // needs to be stopped the media is stopped 181 // needs to be stopped the media is stopped
177 QTimer::singleShot( 1000, this, SLOT( position() ) ); 182 QTimer::singleShot( 1000, this, SLOT( position() ) );
178// qDebug("POSITION : %d", m_position); 183 }
184 // qDebug("POSITION : %d", m_position);
179 return m_position; 185 return m_position;
180} 186}
181 187
@@ -184,7 +190,48 @@ long XineControl::position() {
184 * @param isSet 190 * @param isSet
185 */ 191 */
186void XineControl::setFullscreen( bool isSet ) { 192void XineControl::setFullscreen( bool isSet ) {
187 libXine->showVideoFullScreen( isSet); 193 libXine->showVideoFullScreen( isSet );
194}
195
196
197QString XineControl::getMetaInfo() {
198
199 QString returnString;
200
201 if ( !libXine->metaInfo( 0 ).isEmpty() ) {
202 returnString += tr( " Titel: " + libXine->metaInfo( 0 ) );
203 }
204
205 if ( !libXine->metaInfo( 1 ).isEmpty() ) {
206 returnString += tr( " Comment: " + libXine->metaInfo( 1 ) );
207 }
208
209 if ( !libXine->metaInfo( 2 ).isEmpty() ) {
210 returnString += tr( " Artist: " + libXine->metaInfo( 2 ) );
211 }
212
213 if ( !libXine->metaInfo( 3 ).isEmpty() ) {
214 returnString += tr( " Genre: " + libXine->metaInfo( 3 ) );
215 }
216
217 if ( !libXine->metaInfo( 4 ).isEmpty() ) {
218 returnString += tr( " Album: " + libXine->metaInfo( 4 ) );
219 }
220
221 if ( !libXine->metaInfo( 5 ).isEmpty() ) {
222 returnString += tr( " Year: " + libXine->metaInfo( 5 ) );
223 }
224 return returnString;
225}
226
227QString XineControl::getErrorCode() {
228 int errorCode = libXine->error();
229
230 if ( errorCode == 1 ) {
231 return tr( "No input plugin found for this media type" );
232 } else {
233 return tr( "Some other error" );
234 }
188} 235}
189 236
190/** 237/**
@@ -192,9 +239,9 @@ void XineControl::setFullscreen( bool isSet ) {
192 * @param second the second to jump to 239 * @param second the second to jump to
193 */ 240 */
194void XineControl::seekTo( long second ) { 241void XineControl::seekTo( long second ) {
195 libXine->play( m_fileName , 0, (int)second ); 242 libXine->seekTo( (int)second );
196} 243}
197 244
198void XineControl::videoResized ( const QSize &s ) { 245void XineControl::videoResized ( const QSize &s ) {
199 libXine-> resize ( s ); 246 libXine->resize( s );
200} 247}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 1de610b..b1300a8 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -35,7 +35,6 @@
35#define XINECONTROL_H 35#define XINECONTROL_H
36 36
37#include "lib.h" 37#include "lib.h"
38#include "mediadetect.h"
39#include <qobject.h> 38#include <qobject.h>
40 39
41class XineControl : public QObject { 40class XineControl : public QObject {
@@ -77,6 +76,18 @@ public slots:
77 */ 76 */
78 void nextMedia(); 77 void nextMedia();
79 78
79 /**
80 * Get as much info about the stream from xine as possible
81 */
82 QString getMetaInfo();
83
84 /**
85 * get the error code and "translate" it for the user
86 *
87 */
88 QString getErrorCode();
89
90
80 void videoResized ( const QSize &s ); 91 void videoResized ( const QSize &s );
81 92
82 /** 93 /**
@@ -88,7 +99,6 @@ public slots:
88 99
89private: 100private:
90 XINE::Lib *libXine; 101 XINE::Lib *libXine;
91 MediaDetect mdetect;
92 long m_currentTime; 102 long m_currentTime;
93 long m_position; 103 long m_position;
94 int m_length; 104 int m_length;