author | harlekin <harlekin> | 2002-07-09 12:33:52 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-09 12:33:52 (UTC) |
commit | 2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd (patch) (side-by-side diff) | |
tree | 8ce99f4cde91c9346a4cd6f7029ec1d1308cfb30 /noncore/multimedia | |
parent | c0d304c69f6c42328472cd1328d9cad7c2ed4dfb (diff) | |
download | opie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.zip opie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.tar.gz opie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.tar.bz2 |
more gui work
-rw-r--r-- | noncore/multimedia/opieplayer2/mediadetect.cpp | 38 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediadetect.h | 31 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 357 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 2 |
6 files changed, 200 insertions, 252 deletions
diff --git a/noncore/multimedia/opieplayer2/mediadetect.cpp b/noncore/multimedia/opieplayer2/mediadetect.cpp new file mode 100644 index 0000000..7deeb2f --- a/dev/null +++ b/noncore/multimedia/opieplayer2/mediadetect.cpp @@ -0,0 +1,38 @@ +#include <qstring.h> +#include "mediadetect.h" + + +MediaDetect::MediaDetect() { +} + +MediaDetect::~MediaDetect() { +} + +char MediaDetect::videoOrAudio( const QString& fileName ) { + if( fileName.right(4) == ".avi" || + fileName.right(4) == ".mpg" || + fileName.right(4) == ".asf" || + fileName.right(4) == ".mov" || + fileName.right(5) == ".mpeg" ) { + return 'v'; + } else if ( fileName.right(4) == ".avi" || + fileName.right(4) == ".mp3" || + fileName.right(4) == ".ogg" || + fileName.right(4) == ".wav" ) { + return 'a'; + } else { + return 'f'; + } +} + +bool MediaDetect::isStreaming( const QString& fileName ) { + // ugly + if( fileName.left(4) == "http" ) { + return true; + } else if (fileName.left(3) == "ftp" ) { + return true; + } else { + return false; + } +} + diff --git a/noncore/multimedia/opieplayer2/mediadetect.h b/noncore/multimedia/opieplayer2/mediadetect.h new file mode 100644 index 0000000..bd5ea1d --- a/dev/null +++ b/noncore/multimedia/opieplayer2/mediadetect.h @@ -0,0 +1,31 @@ + +#ifndef MEDIADETECT_H +#define MEDIADETECT_H + + +class QString; +class MediaDetect { + +public: + MediaDetect(); + ~MediaDetect(); + + /** + * Look at the filename and decide which gui is to be used + * + * @param filename the filename + * @return the char - a for audio gui, v for video, f for error + */ + char videoOrAudio( const QString& fileName ); + + /** + * Find out if it is a streaming media file + * + * @param filename the filename + * @return if it is a streaming url or not + */ + bool isStreaming( const QString& fileName ); + +}; + +#endif diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index bcd9b92..37208ef 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG = qt warn_on release #release DESTDIR = $(OPIEDIR)/bin -HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\ +HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\ videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ frame.h lib.h SOURCES = main.cpp \ - playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\ + playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\ videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ frame.cpp lib.cpp nullvideo.c TARGET = opieplayer INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lpthread -lopie -lxine -lxineutils diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 0390c99..9373f6b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -31,13 +31,12 @@ #include <qpoint.h> #include <qlineedit.h> #include <qpushbutton.h> #include <qregexp.h> #include <qtextstream.h> -//#include <qtimer.h> #include "playlistselection.h" #include "playlistwidget.h" #include "mediaplayerstate.h" #include "inputDialog.h" @@ -58,19 +57,15 @@ #include <stdlib.h> #define BUTTONS_ON_TOOLBAR #define SIDE_BUTTONS #define CAN_SAVE_LOAD_PLAYLISTS -extern AudioWidget *audioUI; -extern VideoWidget *videoUI; extern MediaPlayerState *mediaPlayerState; -// class myFileSelector { -// }; class PlayListWidgetPrivate { public: QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; QFrame *playListFrame; FileSelector *files; PlayListSelection *selectedFiles; @@ -79,13 +74,13 @@ public: }; class ToolButton : public QToolButton { public: ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) - : QToolButton( parent, name ) { + : QToolButton( parent, name ) { setTextLabel( name ); setPixmap( Resource::loadPixmap( icon ) ); setAutoRaise( TRUE ); setFocusPolicy( QWidget::NoFocus ); setToggleButton( t ); connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); @@ -102,52 +97,48 @@ public: addTo( parent ); } }; PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) - : QMainWindow( parent, name, fl ) { + : QMainWindow( parent, name, fl ) { d = new PlayListWidgetPrivate; d->setDocumentUsed = FALSE; d->current = NULL; fromSetDocument = FALSE; insanityBool=FALSE; audioScan = FALSE; videoScan = FALSE; -// menuTimer = new QTimer( this ,"menu timer"), -// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); setBackgroundMode( PaletteButton ); setCaption( tr("OpiePlayer") ); setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); setToolBarsMovable( FALSE ); - // Create Toolbar + // Create Toolbar QPEToolBar *toolbar = new QPEToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); - // Create Menubar + // Create Menubar QPEMenuBar *menu = new QPEMenuBar( toolbar ); menu->setMargin( 0 ); QPEToolBar *bar = new QPEToolBar( this ); bar->setLabel( tr( "Play Operations" ) ); -// d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", -// this , SLOT( addSelected()) ); + tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); tbDeletePlaylist->setFlat(TRUE); tbDeletePlaylist->setFixedSize(20,20); d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", this , SLOT(addSelected()) ); d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist", this , SLOT(removeSelected()) ); -// d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE ); d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", this , SLOT( btnPlay(bool) ), TRUE ); d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop", mediaPlayerState, SLOT(setLooping(bool)), TRUE ); @@ -183,32 +174,28 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) tabWidget = new QTabWidget( hbox6, "tabWidget" ); tabWidget->setTabShape(QTabWidget::Triangular); QWidget *pTab; pTab = new QWidget( tabWidget, "pTab" ); -// playlistView = new QListView( pTab, "playlistview" ); -// playlistView->setMinimumSize(236,260); tabWidget->insertTab( pTab,"Playlist"); - // Add the playlist area + // Add the playlist area QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); d->playListFrame = vbox3; d->playListFrame ->setMinimumSize(235,260); QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); d->selectedFiles = new PlayListSelection( hbox2); QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); - - QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch @@ -227,16 +214,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) audioView->setSelectionMode( QListView::Extended); tabWidget->insertTab(aTab,tr("Audio")); QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); -// audioView -// populateAudioView(); -// videowidget - QWidget *vTab; vTab = new QWidget( tabWidget, "vTab" ); videoView = new QListView( vTab, "Videoview" ); videoView->setMinimumSize(233,260); videoView->addColumn(tr("Title"),140); @@ -248,101 +231,72 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) videoView->setMultiSelection( TRUE ); videoView->setSelectionMode( QListView::Extended); QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); tabWidget->insertTab( vTab,tr("Video")); -// populateVideoView(); -//playlists list + //playlists list QWidget *LTab; LTab = new QWidget( tabWidget, "LTab" ); playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy playLists->setMinimumSize(233,260); tabWidget->insertTab(LTab,tr("Lists")); -// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); - -// add the library area - -// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), -// this, SLOT( fauxPlay( QListViewItem *) ) ); -// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), -// this, SLOT( fauxPlay( QListViewItem *)) ); - -// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); -// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); - connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); - connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); - connect( audioView, SIGNAL( returnPressed( QListViewItem *)), this,SLOT( playIt( QListViewItem *)) ); connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); - connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); connect( videoView, SIGNAL( returnPressed( QListViewItem *)), this,SLOT( playIt( QListViewItem *)) ); connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); - connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); - - connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); - connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); - connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); -// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); setCentralWidget( vbox5 ); Config cfg( "OpiePlayer" ); readConfig( cfg ); QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); -// qDebug("currentList is "+currentPlaylist); loadList(DocLnk( currentPlaylist)); setCaption(tr("OpiePlayer: ")+ currentPlaylist ); initializeStates(); } PlayListWidget::~PlayListWidget() { Config cfg( "OpiePlayer" ); writeConfig( cfg ); - - if ( d->current ) + if ( d->current ) { delete d->current; + } delete d; } void PlayListWidget::initializeStates() { d->tbPlay->setOn( mediaPlayerState->playing() ); d->tbLoop->setOn( mediaPlayerState->looping() ); d->tbShuffle->setOn( mediaPlayerState->shuffled() ); -// d->tbFull->setOn( mediaPlayerState->fullscreen() ); -// d->tbScale->setOn( mediaPlayerState->scaled() ); -// d->tbScale->setEnabled( mediaPlayerState->fullscreen() ); -// setPlaylist( mediaPlayerState->playlist() ); setPlaylist( true); -// d->selectedFiles->first(); - } void PlayListWidget::readConfig( Config& cfg ) { cfg.setGroup("PlayList"); QString currentString = cfg.readEntry("current", "" ); @@ -354,13 +308,12 @@ void PlayListWidget::readConfig( Config& cfg ) { DocLnk lnk( linkFile ); if ( lnk.isValid() ) { d->selectedFiles->addToSelection( lnk ); } } d->selectedFiles->setSelectedItem( currentString); -// d->selectedFiles->setSelectedItem( (const QString &)currentString); } void PlayListWidget::writeConfig( Config& cfg ) const { d->selectedFiles->writeCurrent( cfg); @@ -369,13 +322,12 @@ void PlayListWidget::writeConfig( Config& cfg ) const { d->selectedFiles->first(); do { const DocLnk *lnk = d->selectedFiles->current(); if ( lnk ) { QString entryName; entryName.sprintf( "File%i", noOfFiles + 1 ); -// qDebug(entryName); cfg.writeEntry( entryName, lnk->linkFile() ); // if this link does exist, add it so we have the file // next time... if ( !QFile::exists( lnk->linkFile() ) ) { // the way writing lnks doesn't really check for out // of disk space, but check it anyway. @@ -395,50 +347,48 @@ void PlayListWidget::writeConfig( Config& cfg ) const { while ( d->selectedFiles->next() ); cfg.writeEntry("NumberOfFiles", noOfFiles ); } void PlayListWidget::addToSelection( const DocLnk& lnk ) { -// qDebug("add"); -// if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) { -// QMessageBox::message("Note","You are trying to play\na malformed url."); - -// } else { - d->setDocumentUsed = FALSE; if ( mediaPlayerState->playlist() ) { if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" ) d->selectedFiles->addToSelection( lnk ); } else mediaPlayerState->setPlaying( TRUE ); -// } } void PlayListWidget::clearList() { - while ( first() ) + while ( first() ) { d->selectedFiles->removeSelected(); + } } void PlayListWidget::addAllToList() { DocLnkSet filesAll; Global::findDocuments(&filesAll, "video/*;audio/*"); QListIterator<DocLnk> Adit( filesAll.children() ); - for ( ; Adit.current(); ++Adit ) - if(QFileInfo(Adit.current()->file()).exists()) + for ( ; Adit.current(); ++Adit ) { + if(QFileInfo(Adit.current()->file()).exists()) { d->selectedFiles->addToSelection( **Adit ); + } + } } void PlayListWidget::addAllMusicToList() { QListIterator<DocLnk> dit( files.children() ); - for ( ; dit.current(); ++dit ) - if(QFileInfo(dit.current()->file()).exists()) + for ( ; dit.current(); ++dit ) { + if(QFileInfo(dit.current()->file()).exists()) { d->selectedFiles->addToSelection( **dit ); + } + } } void PlayListWidget::addAllVideoToList() { QListIterator<DocLnk> dit( vFiles.children() ); for ( ; dit.current(); ++dit ) @@ -451,20 +401,18 @@ void PlayListWidget::setDocument(const QString& fileref) { qDebug(fileref); fromSetDocument = TRUE; if ( fileref.isNull() ) { QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); return; } -// qDebug("setDocument "+fileref); + if(fileref.find("m3u",0,TRUE) != -1) { //is m3u readm3u( fileref); - } - else if(fileref.find("pls",0,TRUE) != -1) { //is pls + } else if(fileref.find("pls",0,TRUE) != -1) { //is pls readPls( fileref); - } - else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist + } else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist clearList(); loadList(DocLnk(fileref)); d->selectedFiles->first(); } else { clearList(); addToSelection( DocLnk( fileref ) ); @@ -476,13 +424,13 @@ void PlayListWidget::setDocument(const QString& fileref) { setCaption(tr("OpiePlayer")); } } void PlayListWidget::setActiveWindow() { - // When we get raised we need to ensure that it switches views + // When we get raised we need to ensure that it switches views char origView = mediaPlayerState->view(); mediaPlayerState->setView( 'l' ); // invalidate mediaPlayerState->setView( origView ); // now switch back } @@ -490,34 +438,19 @@ void PlayListWidget::useSelectedDocument() { d->setDocumentUsed = FALSE; } const DocLnk *PlayListWidget::current() { // this is fugly -// if( fromSetDocument) { -// qDebug("from setDoc"); -// DocLnkSet files; -// Global::findDocuments(&files, "video/*;audio/*"); -// QListIterator<DocLnk> dit( files.children() ); -// for ( ; dit.current(); ++dit ) { -// if(dit.current()->linkFile() == setDocFileRef) { -// qDebug(setDocFileRef); -// return dit; -// } -// } -// } else - - switch (tabWidget->currentPageIndex()) { case 0: //playlist { qDebug("playlist"); if ( mediaPlayerState->playlist() ) { return d->selectedFiles->current(); - } - else if ( d->setDocumentUsed && d->current ) { + } else if ( d->setDocumentUsed && d->current ) { return d->current; } else { return d->files->selected(); } } break; @@ -622,58 +555,60 @@ void PlayListWidget::saveList() { fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { if ( d->current ) delete d->current; filename = fileDlg->LineEdit1->text();//+".playlist"; -// qDebug("saving playlist "+filename+".playlist"); + // qDebug("saving playlist "+filename+".playlist"); Config cfg( filename +".playlist"); writeConfig( cfg ); DocLnk lnk; -// lnk.setComment( ""); lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D lnk.setIcon("opieplayer/playlist2"); lnk.setName( filename); //sets file name -// qDebug(filename); - if(!lnk.writeLink()) + // qDebug(filename); + if(!lnk.writeLink()) { qDebug("Writing doclink did not work"); + } } Config config( "OpiePlayer" ); config.writeEntry("CurrentPlaylist",filename); setCaption(tr("OpiePlayer: ")+filename); d->selectedFiles->first(); - if(fileDlg) + if(fileDlg) { delete fileDlg; + } } void PlayListWidget::loadList( const DocLnk & lnk) { QString name= lnk.name(); -// qDebug("currentList is "+name); + // qDebug("currentList is "+name); if( name.length()>1) { setCaption("OpiePlayer: "+name); -// qDebug("load list "+ name+".playlist"); + // qDebug("load list "+ name+".playlist"); clearList(); Config cfg( name+".playlist"); readConfig(cfg); tabWidget->setCurrentPage(0); Config config( "OpiePlayer" ); config.writeEntry("CurrentPlaylist", name); -// d->selectedFiles->first(); + // d->selectedFiles->first(); } } void PlayListWidget::setPlaylist( bool shown ) { - if ( shown ) + if ( shown ) { d->playListFrame->show(); - else + } else { d->playListFrame->hide(); + } } void PlayListWidget::setView( char view ) { if ( view == 'l' ) showMaximized(); else @@ -688,15 +623,12 @@ void PlayListWidget::addSelected() { int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); switch (tabWidget->currentPageIndex()) { case 0: //playlist break; case 1: { //audio -// QString entryName; -// entryName.sprintf( "File%i", i + 1 ); -// QString linkFile = cfg.readEntry( entryName ); QListViewItemIterator it( audioView ); // iterate through all items of the listview for ( ; it.current(); ++it ) { if ( it.current()->isSelected() ) { QListIterator<DocLnk> dit( files.children() ); for ( ; dit.current(); ++dit ) { @@ -718,42 +650,26 @@ void PlayListWidget::addSelected() { QListIterator<DocLnk> dit( vFiles.children() ); for ( ; dit.current(); ++dit ) { if( dit.current()->name() == it.current()->text(0) ) { d->selectedFiles->addToSelection( **dit ); } } - videoView->setSelected( it.current(),FALSE); } } -// for ( int i = 0; i < noOfFiles; i++ ) { -// QString entryName; -// entryName.sprintf( "File%i", i + 1 ); -// QString linkFile = cfg.readEntry( entryName ); -// if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) { -// int result= QMessageBox::warning(this,tr("OpiePlayer"), -// tr("This is all ready in your playlist.\nContinue?"), -// tr("Yes"),tr("No"),0,0,1); -// if (result !=0) -// return; -// } -// } -// addToSelection( videoView->selectedItem() ); tabWidget->setCurrentPage(0); } break; }; } void PlayListWidget::removeSelected() { d->selectedFiles->removeSelected( ); } void PlayListWidget::playIt( QListViewItem *it) { -// d->setDocumentUsed = FALSE; -// mediaPlayerState->curPosition =0; qDebug("playIt"); mediaPlayerState->setPlaying(FALSE); mediaPlayerState->setPlaying(TRUE); d->selectedFiles->unSelect(); } @@ -830,43 +746,38 @@ void PlayListWidget::tabChanged(QWidget *widg) { } void PlayListWidget::btnPlay(bool b) { // mediaPlayerState->setPlaying(b); switch ( tabWidget->currentPageIndex()) { - case 0: - { -// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 -// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) { -// QMessageBox::message("Note","You are trying to play\na malformed url."); -// } else { - mediaPlayerState->setPlaying(b); -// } - } - break; - case 1: + case 0: { - addToSelection( audioView->currentItem() ); mediaPlayerState->setPlaying(b); - d->selectedFiles->removeSelected( ); - tabWidget->setCurrentPage(1); - d->selectedFiles->unSelect(); - insanityBool=FALSE; - }// audioView->clearSelection(); - break; - case 2: - { - addToSelection( videoView->currentItem() ); - mediaPlayerState->setPlaying(b); - qApp->processEvents(); - d->selectedFiles->removeSelected( ); - tabWidget->setCurrentPage(2); - d->selectedFiles->unSelect(); - insanityBool=FALSE; - }// videoView->clearSelection(); + } break; + case 1: + { + addToSelection( audioView->currentItem() ); + mediaPlayerState->setPlaying(b); + d->selectedFiles->removeSelected( ); + tabWidget->setCurrentPage(1); + d->selectedFiles->unSelect(); + insanityBool=FALSE; + }// audioView->clearSelection(); + break; + case 2: + { + addToSelection( videoView->currentItem() ); + mediaPlayerState->setPlaying(b); + qApp->processEvents(); + d->selectedFiles->removeSelected( ); + tabWidget->setCurrentPage(2); + d->selectedFiles->unSelect(); + insanityBool=FALSE; + }// videoView->clearSelection(); + break; }; } void PlayListWidget::deletePlaylist() { switch( QMessageBox::information( this, (tr("Remove Playlist?")), @@ -879,55 +790,46 @@ void PlayListWidget::deletePlaylist() { break; case 1: // Cancel break; }; } -void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) -{ +void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) { switch (mouse) { case 1: break; case 2:{ - QPopupMenu m; m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); m.insertSeparator(); - if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) - m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); - + m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); m.exec( QCursor::pos() ); } break; }; } -void PlayListWidget::playSelected() -{ +void PlayListWidget::playSelected() { btnPlay( TRUE); -// d->selectedFiles->unSelect(); } -void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) -{ +void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) { switch (mouse) { case 1: break; - case 2:{ + case 2: + { QPopupMenu m; m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); -// m.insertSeparator(); -// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); m.exec( QCursor::pos() ); } break; }; - } void PlayListWidget::listDelete() { Config cfg( "OpiePlayer" ); cfg.setGroup("PlayList"); QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); @@ -936,42 +838,27 @@ void PlayListWidget::listDelete() { switch ( tabWidget->currentPageIndex()) { case 0: break; case 1: { file = audioView->selectedItem()->text(0); -// Global::findDocuments(&files, "audio/*"); -// AppLnkSet appFiles; QListIterator<DocLnk> dit( files.children() ); for ( ; dit.current(); ++dit ) { if( dit.current()->name() == file) { -// qDebug(file); + // qDebug(file); LnkProperties prop( dit.current() ); -// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); prop.showMaximized(); prop.exec(); } } populateAudioView(); } break; case 2: { -// file = videoView->selectedItem()->text(0); -// for ( int i = 0; i < noOfFiles; i++ ) { -// QString entryName; -// entryName.sprintf( "File%i", i + 1 ); -// QString linkFile = cfg.readEntry( entryName ); -// AppLnk lnk( AppLnk(linkFile)); -// if( lnk.name() == file ) { -// LnkProperties prop( &lnk); -// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); -// prop.showMaximized(); -// prop.exec(); -// } -// } + } break; }; } void PlayListWidget::scanForAudio() { @@ -1012,13 +899,13 @@ void PlayListWidget::populateAudioView() { const QString path = (*it)->path(); if(dit.current()->file().find(path) != -1 ) storage=name; } QListViewItem * newItem; if ( QFile( dit.current()->file()).exists() ) { -// qDebug(dit.current()->name()); + // qDebug(dit.current()->name()); newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage); newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); } } @@ -1055,46 +942,41 @@ void PlayListWidget::openFile() { QString filename, name; InputDialog *fileDlg; fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { filename = fileDlg->LineEdit1->text(); -// http://205.188.234.129:8030 -// http://66.28.68.70:8000 -// filename.replace(QRegExp("%20")," "); - if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) { - QMessageBox::message("Note","Spaces in urls are not allowed."); - return; + + qDebug("Selected filename is "+filename); + if(filename.right(3) == "m3u") { + readm3u( filename ); + } else if(filename.right(3) == "pls") { + readPls( filename ); } else { - qDebug("Selected filename is "+filename); - if(filename.right(3) == "m3u") - readm3u( filename); - else if(filename.right(3) == "pls") - readPls( filename); - else { - DocLnk lnk; - - lnk.setName(filename); //sets file name - if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") - filename += "/"; - lnk.setFile(filename); //sets File property + DocLnk lnk; - lnk.setType("audio/x-mpegurl"); - lnk.setExec("opieplayer"); - lnk.setIcon("opieplayer/MPEGPlayer"); + lnk.setName(filename); //sets file name + // probably not needed anymore either + if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") { + filename += "/"; + } + lnk.setFile(filename); //sets File property + + lnk.setType("audio/x-mpegurl"); + lnk.setExec("opieplayer"); + lnk.setIcon("opieplayer/MPEGPlayer"); - if(!lnk.writeLink()) + if(!lnk.writeLink()) { qDebug("Writing doclink did not work"); - d->selectedFiles->addToSelection( lnk); -// if(fileDlg2) -// delete fileDlg2; } + d->selectedFiles->addToSelection( lnk); } } - if(fileDlg) + if(fileDlg) { delete fileDlg; + } } void PlayListWidget::keyReleaseEvent( QKeyEvent *e) { switch ( e->key() ) { ////////////////////////////// Zaurus keys @@ -1185,15 +1067,15 @@ void PlayListWidget::doBlank() { ioctl(fd,FBIOBLANK,1); // close(fd); } } void PlayListWidget::doUnblank() { - // this crashes opieplayer with a segfault -// int fd; -// fd=open("/dev/fb0",O_RDWR); + // this crashes opieplayer with a segfault + // int fd; + // fd=open("/dev/fb0",O_RDWR); qDebug("do unblanking"); if (fd != -1) { ioctl(fd,FBIOBLANK,0); close(fd); } QCopEnvelope h("QPE/System", "setBacklight(int)"); @@ -1207,53 +1089,45 @@ void PlayListWidget::readm3u(const QString &filename) { if(f.open(IO_ReadOnly)) { QTextStream t(&f); QString s;//, first, second; int i=0; while ( !t.atEnd()) { -// Lview->insertLine(t.readLine(),-1); s=t.readLine(); - if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) { - QMessageBox::message("Note","Spaces in urls are not allowed."); - } - else if(s.find("#",0,TRUE) == -1) { + + if(s.find("#",0,TRUE) == -1) { if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat if(s.left(2) == "E:" || s.left(2) == "P:") { s=s.right(s.length()-2); DocLnk lnk( s ); QFileInfo f(s); QString name = f.baseName(); - name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); - lnk.setName( name); + name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 ); + lnk.setName( name ); s=s.replace( QRegExp("\\"),"/"); - lnk.setFile( s); + lnk.setFile( s ); lnk.writeLink(); -// lnk.setIcon(opieplayer/MPEGPlayer); qDebug("add "+name); d->selectedFiles->addToSelection( lnk); } else { // is url - s.replace(QRegExp("%20")," "); - DocLnk lnk( s); + DocLnk lnk( s ); QString name; - if(name.left(4)=="http") + if(name.left(4)=="http") { name = s.right( s.length() - 7); - else - name=s; -// name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); + } else { + name = s; + } lnk.setName(name); - if(s.at(s.length()-4) == '.') + if(s.at(s.length()-4) == '.') { lnk.setFile( s); - else + } else { lnk.setFile( s+"/"); -// lnk.setFile( filename); -// lnk.setComment( s+"/"); + } lnk.setType("audio/x-mpegurl"); lnk.writeLink(); -// lnk.setIcon( "opieplayer/MPEGPlayer"); -// qDebug("add "+s); d->selectedFiles->addToSelection( lnk); } i++; } } } @@ -1270,14 +1144,14 @@ void PlayListWidget::writem3u() { if( fileDlg->result() == 1 ) { filename = fileDlg->LineEdit1->text(); qDebug(filename); int noOfFiles = 0; d->selectedFiles->first(); do { -// we dont check for existance because of url's -// qDebug(d->selectedFiles->current()->file()); + // we dont check for existance because of url's + // qDebug(d->selectedFiles->current()->file()); list += d->selectedFiles->current()->file()+"\n"; noOfFiles++; } while ( d->selectedFiles->next() ); qDebug(list); if(filename.left(1) != "/") @@ -1305,32 +1179,27 @@ void PlayListWidget::readPls(const QString &filename) { while ( !t.atEnd()) { s=t.readLine(); if(s.left(4) == "File") { s=s.right(s.length() - 6); s.replace(QRegExp("%20")," "); qDebug("adding "+s+" to playlist"); -// numberofentries=2 -// File1=http -// Title -// Length -// Version -// File2=http - + // numberofentries=2 + // File1=http + // Title + // Length + // Version + // File2=http s=s.replace( QRegExp("\\"),"/"); DocLnk lnk( s ); QFileInfo f(s); QString name = f.baseName(); if(name.left(4)=="http") name = s.right( s.length() - 7); else name=s; name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); -// QFileInfo f(s); -// QString name = f.baseName(); -// name = name.left(name.length()-4); -// name = name.right(name.findRev("/",0,TRUE)); lnk.setName( name); if(s.at(s.length()-4) == '.') // if this is probably a file lnk.setFile( s); else { //if its a url if( name.right(1).find('/') == -1) s+="/"; diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 5b674f8..7407e4e 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -1,10 +1,11 @@ #include "xinecontrol.h" #include "mediaplayerstate.h" + extern MediaPlayerState *mediaPlayerState; XineControl::XineControl( QObject *parent, const char *name ) : QObject( parent, name ) { libXine = new XINE::Lib(); @@ -19,30 +20,37 @@ XineControl::~XineControl() { } void XineControl::play( const QString& fileName ) { libXine->play( fileName ); mediaPlayerState->setPlaying( true ); // default to audio view until we know how to handle video - mediaPlayerState->setView('a'); - // determines of slider is shown - // mediaPlayerState->setIsStreaming( false ); - // hier dann schaun welcher view + // MediaDetect mdetect; + char whichGui = mdetect.videoOrAudio( fileName ); + if (whichGui == 'f') { + qDebug("Nicht erkannter Dateityp"); + return; + } + + // which gui (video / audio) + mediaPlayerState->setView( whichGui ); + + // determine if slider is shown + mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); } void XineControl::stop( bool isSet ) { if ( !isSet) { libXine->stop(); - mediaPlayerState->setNext(); + mediaPlayerState->setList(); //mediaPlayerState->setPlaying( false ); } else { // play again } } void XineControl::pause( bool isSet) { - libXine->pause(); } int XineControl::currentTime() { // todo: jede sekunde überprüfen m_currentTime = libXine->currentTime(); diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index e45f1df..aab00cd 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h @@ -1,11 +1,12 @@ #ifndef XINECONTROL_H #define XINECONTROL_H #include "lib.h" +#include "mediadetect.h" #include <qobject.h> class XineControl : public QObject { Q_OBJECT public: XineControl( QObject *parent = 0, const char *name =0 ); @@ -22,12 +23,13 @@ public slots: void length(); int position(); private: XINE::Lib *libXine; + MediaDetect mdetect; int m_length; int m_currentTime; int m_position; signals: void positionChanged( int position ); |