Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 229 |
1 files changed, 49 insertions, 180 deletions
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 @@ -36,3 +36,2 @@ -//#include <qtimer.h> @@ -63,9 +62,5 @@ -extern AudioWidget *audioUI; -extern VideoWidget *videoUI; extern MediaPlayerState *mediaPlayerState; -// class myFileSelector { -// }; class PlayListWidgetPrivate { @@ -116,4 +111,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) videoScan = FALSE; -// menuTimer = new QTimer( this ,"menu timer"), -// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); @@ -136,4 +129,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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"); @@ -146,3 +138,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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", @@ -188,4 +179,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) pTab = new QWidget( tabWidget, "pTab" ); -// playlistView = new QListView( pTab, "playlistview" ); -// playlistView->setMinimumSize(236,260); tabWidget->insertTab( pTab,"Playlist"); @@ -206,4 +195,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) - - QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch @@ -232,6 +219,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) -// audioView -// populateAudioView(); -// videowidget - QWidget *vTab; @@ -253,3 +236,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) tabWidget->insertTab( vTab,tr("Video")); -// populateVideoView(); @@ -262,14 +244,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) -// 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())); @@ -279,6 +249,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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 *)), @@ -286,3 +254,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); - connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), @@ -292,8 +259,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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 ) ) ); @@ -302,5 +265,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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 & ) ) ); @@ -311,3 +272,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); -// qDebug("currentList is "+currentPlaylist); loadList(DocLnk( currentPlaylist)); @@ -323,5 +283,5 @@ PlayListWidget::~PlayListWidget() { - - if ( d->current ) + if ( d->current ) { delete d->current; + } delete d; @@ -335,9 +295,3 @@ void PlayListWidget::initializeStates() { 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(); - } @@ -359,3 +313,2 @@ void PlayListWidget::readConfig( Config& cfg ) { d->selectedFiles->setSelectedItem( currentString); -// d->selectedFiles->setSelectedItem( (const QString &)currentString); } @@ -374,3 +327,2 @@ void PlayListWidget::writeConfig( Config& cfg ) const { entryName.sprintf( "File%i", noOfFiles + 1 ); -// qDebug(entryName); cfg.writeEntry( entryName, lnk->linkFile() ); @@ -400,8 +352,2 @@ void PlayListWidget::writeConfig( Config& cfg ) const { 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; @@ -413,3 +359,2 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { mediaPlayerState->setPlaying( TRUE ); -// } } @@ -418,5 +363,6 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { void PlayListWidget::clearList() { - while ( first() ) + while ( first() ) { d->selectedFiles->removeSelected(); } +} @@ -427,6 +373,8 @@ void PlayListWidget::addAllToList() { 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 ); } + } +} @@ -435,6 +383,8 @@ 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 ); } + } +} @@ -456,10 +406,8 @@ void PlayListWidget::setDocument(const QString& fileref) { } -// 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(); @@ -495,16 +443,2 @@ 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()) { @@ -515,4 +449,3 @@ const DocLnk *PlayListWidget::current() { // this is fugly return d->selectedFiles->current(); - } - else if ( d->setDocumentUsed && d->current ) { + } else if ( d->setDocumentUsed && d->current ) { return d->current; @@ -632,3 +565,2 @@ void PlayListWidget::saveList() { DocLnk lnk; -// lnk.setComment( ""); lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property @@ -638,5 +570,6 @@ void PlayListWidget::saveList() { // qDebug(filename); - if(!lnk.writeLink()) + if(!lnk.writeLink()) { qDebug("Writing doclink did not work"); } + } Config config( "OpiePlayer" ); @@ -645,5 +578,6 @@ void PlayListWidget::saveList() { d->selectedFiles->first(); - if(fileDlg) + if(fileDlg) { delete fileDlg; } +} @@ -669,7 +603,8 @@ void PlayListWidget::loadList( const DocLnk & lnk) { void PlayListWidget::setPlaylist( bool shown ) { - if ( shown ) + if ( shown ) { d->playListFrame->show(); - else + } else { d->playListFrame->hide(); } +} @@ -693,5 +628,2 @@ void PlayListWidget::addSelected() { case 1: { //audio -// QString entryName; -// entryName.sprintf( "File%i", i + 1 ); -// QString linkFile = cfg.readEntry( entryName ); QListViewItemIterator it( audioView ); @@ -723,3 +655,2 @@ void PlayListWidget::addSelected() { } - videoView->setSelected( it.current(),FALSE); @@ -727,15 +658,2 @@ void PlayListWidget::addSelected() { } -// 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); @@ -751,4 +669,2 @@ void PlayListWidget::removeSelected() { void PlayListWidget::playIt( QListViewItem *it) { -// d->setDocumentUsed = FALSE; -// mediaPlayerState->curPosition =0; qDebug("playIt"); @@ -837,8 +753,3 @@ void PlayListWidget::btnPlay(bool b) { { -// 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); -// } } @@ -884,4 +795,3 @@ void PlayListWidget::deletePlaylist() { -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) { @@ -890,3 +800,2 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& case 2:{ - QPopupMenu m; @@ -895,5 +804,3 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& m.insertSeparator(); - if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); - m.exec( QCursor::pos() ); @@ -904,10 +811,7 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& -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) { @@ -916,3 +820,4 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const break; - case 2:{ + case 2: + { QPopupMenu m; @@ -920,4 +825,2 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); -// m.insertSeparator(); -// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); m.exec( QCursor::pos() ); @@ -926,3 +829,2 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const }; - } @@ -941,4 +843,2 @@ void PlayListWidget::listDelete() { file = audioView->selectedItem()->text(0); -// Global::findDocuments(&files, "audio/*"); -// AppLnkSet appFiles; QListIterator<DocLnk> dit( files.children() ); @@ -948,3 +848,2 @@ void PlayListWidget::listDelete() { LnkProperties prop( dit.current() ); -// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); prop.showMaximized(); @@ -958,15 +857,3 @@ void PlayListWidget::listDelete() { { -// 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(); -// } -// } + } @@ -1060,15 +947,9 @@ void PlayListWidget::openFile() { 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; - } else { + qDebug("Selected filename is "+filename); - if(filename.right(3) == "m3u") + if(filename.right(3) == "m3u") { readm3u( filename); - else if(filename.right(3) == "pls") + } else if(filename.right(3) == "pls") { readPls( filename); - else { + } else { DocLnk lnk; @@ -1076,4 +957,6 @@ void PlayListWidget::openFile() { lnk.setName(filename); //sets file name - if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") + // probably not needed anymore either + if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") { filename += "/"; + } lnk.setFile(filename); //sets File property @@ -1084,13 +967,12 @@ void PlayListWidget::openFile() { - 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; } +} @@ -1212,8 +1094,5 @@ void PlayListWidget::readm3u(const QString &filename) { 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 @@ -1229,3 +1108,2 @@ void PlayListWidget::readm3u(const QString &filename) { lnk.writeLink(); -// lnk.setIcon(opieplayer/MPEGPlayer); qDebug("add "+name); @@ -1233,3 +1111,2 @@ void PlayListWidget::readm3u(const QString &filename) { } else { // is url - s.replace(QRegExp("%20")," "); @@ -1237,18 +1114,15 @@ void PlayListWidget::readm3u(const QString &filename) { QString name; - if(name.left(4)=="http") + if(name.left(4)=="http") { name = s.right( s.length() - 7); - else + } else { name=s; -// name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); + } 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); @@ -1316,3 +1190,2 @@ void PlayListWidget::readPls(const QString &filename) { // File2=http - s=s.replace( QRegExp("\\"),"/"); @@ -1326,6 +1199,2 @@ void PlayListWidget::readPls(const QString &filename) { 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); |