~ubuntu-branches/debian/sid/smplayer/sid

« back to all changes in this revision

Viewing changes to src/playlist.cpp

Committer: Bazaar Package Importer
Author(s): Maia Kozheva
Date: 2009-03-31 23:05:43 UTC
mto: (1.1.9 upstream) (3.1.2 squeeze)
mto: This revision was merged to the branch mainline in revision 14.
Revision ID: james.westby@ubuntu.com-20090331230543-nsklbxenl2hf2n6h

Tags: upstream-0.6.7

Import upstream version 0.6.7

files added:
Audio_equalizer.txt

Configuring_the_toolbars.txt

Finding_subtitles.txt

Portable_Edition.txt

compile_windows_portable.bat

docs/cs

docs/cs/faq.html

docs/cs/gpl.html

docs/nl

docs/nl/gpl.html

dvdmenus.txt

dxlist

dxlist/README.txt

dxlist/directx

dxlist/directx/README.txt

dxlist/dxlist.pro

dxlist/main.cpp

setup/smplayer-installer.nsi

setup/smplayer_orig.ini

src/assstyles.cpp

src/assstyles.h

src/audioequalizer.cpp

src/audioequalizer.h

src/audioequalizerlist.h

src/colorutils.cpp

src/colorutils.h

src/config.h

src/constants.h

src/core.cpp

src/core.h

src/desktopinfo.cpp

src/desktopinfo.h

src/deviceinfo.cpp

src/deviceinfo.h

src/discname.cpp

src/discname.h

src/filesettings.cpp

src/filesettings.h

src/filesettingsbase.cpp

src/filesettingsbase.h

src/filesettingshash.cpp

src/filesettingshash.h

src/findsubtitles

src/findsubtitles/filedownloader

src/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

src/findsubtitles/filedownloader/filedownloader.pro

src/findsubtitles/filedownloader/main.cpp

src/findsubtitles/findsubtitles.pro

src/findsubtitles/findsubtitlesconfigdialog.cpp

src/findsubtitles/findsubtitlesconfigdialog.h

src/findsubtitles/findsubtitlesconfigdialog.ui

src/findsubtitles/findsubtitleswindow.cpp

src/findsubtitles/findsubtitleswindow.h

src/findsubtitles/findsubtitleswindow.ui

src/findsubtitles/main.cpp

src/findsubtitles/osparser.cpp

src/findsubtitles/osparser.h

src/findsubtitles/quazip

src/findsubtitles/quazip/COPYING

src/findsubtitles/quazip/COPYING.LGPL

src/findsubtitles/quazip/COPYING.readme

src/findsubtitles/quazip/README

src/findsubtitles/quazip/crypt.h

src/findsubtitles/quazip/ioapi.c

src/findsubtitles/quazip/ioapi.h

src/findsubtitles/quazip/quazip.cpp

src/findsubtitles/quazip/quazip.h

src/findsubtitles/quazip/quazip.pro

src/findsubtitles/quazip/quazipfile.cpp

src/findsubtitles/quazip/quazipfile.h

src/findsubtitles/quazip/quazipfileinfo.h

src/findsubtitles/quazip/quazipnewinfo.cpp

src/findsubtitles/quazip/quazipnewinfo.h

src/findsubtitles/quazip/unzip.c

src/findsubtitles/quazip/unzip.h

src/findsubtitles/quazip/zip.c

src/findsubtitles/quazip/zip.h

src/findsubtitles/simplehttp.cpp

src/findsubtitles/simplehttp.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/findsubtitles/subchooserdialog.ui

src/global.cpp

src/global.h

src/helper.cpp

src/helper.h

src/icons-png/audio_equalizer.png

src/icons-png/flip.png

src/icons-png/mirror.png

src/icons-png/play_pause.png

src/infoprovider.cpp

src/infoprovider.h

src/languages

src/languages.cpp

src/languages.h

src/languages/list.txt

src/languages/main.cpp

src/languages/process_list.pro

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/mpcgui

src/mpcgui/mpc_mono.png

src/mpcgui/mpc_stereo.png

src/mpcgui/mpc_toolbar.png

src/mpcgui/mpcgui.cpp

src/mpcgui/mpcgui.h

src/mpcgui/mpcstyles.cpp

src/mpcgui/mpcstyles.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerversion.cpp

src/mplayerversion.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/myprocess.cpp

src/myprocess.h

src/paths.cpp

src/paths.h

src/preferences.cpp

src/preferences.h

src/prefplaylist.cpp

src/prefplaylist.h

src/prefplaylist.ui

src/screensaver.cpp

src/screensaver.h

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcuts/sda.keys

src/subtracks.cpp

src/subtracks.h

src/titletracks.cpp

src/titletracks.h

src/toolbareditor.cpp

src/toolbareditor.h

src/tracks.cpp

src/tracks.h

src/translations/smplayer_ar_SY.ts

src/translations/smplayer_gl.ts

src/translations/smplayer_ku.ts

src/translations/smplayer_sl_SI.ts

src/urlhistory.cpp

src/urlhistory.h

src/videopreview

src/videopreview/async.diff

src/videopreview/main.cpp

src/videopreview/videopreview.cpp

src/videopreview/videopreview.h

src/videopreview/videopreview.pro

src/videopreview/videopreviewconfigdialog.cpp

src/videopreview/videopreviewconfigdialog.h

src/videopreview/videopreviewconfigdialog.ui

files removed:
debian-rvm/cron.d.ex

debian-rvm/emacsen-install.ex

debian-rvm/emacsen-remove.ex

debian-rvm/emacsen-startup.ex

debian-rvm/init.d.ex

debian-rvm/manpage.1.ex

debian-rvm/manpage.sgml.ex

debian-rvm/manpage.xml.ex

debian-rvm/postinst.ex

debian-rvm/postrm.ex

debian-rvm/preinst.ex

debian-rvm/prerm.ex

debian-rvm/smplayer-default.ex

debian-rvm/smplayer.doc-base.EX

debian-rvm/watch.ex

setup/smplayer_lite.iss

src/corelib/config.h

src/corelib/constants.h

src/corelib/core.cpp

src/corelib/core.h

src/corelib/desktopinfo.cpp

src/corelib/desktopinfo.h

src/corelib/global.cpp

src/corelib/global.h

src/corelib/helper.cpp

src/corelib/helper.h

src/corelib/infoprovider.cpp

src/corelib/infoprovider.h

src/corelib/mediadata.cpp

src/corelib/mediadata.h

src/corelib/mediasettings.cpp

src/corelib/mediasettings.h

src/corelib/mplayerprocess.cpp

src/corelib/mplayerprocess.h

src/corelib/mplayerversion.cpp

src/corelib/mplayerversion.h

src/corelib/mplayerwindow.cpp

src/corelib/mplayerwindow.h

src/corelib/myprocess.cpp

src/corelib/myprocess.h

src/corelib/preferences.cpp

src/corelib/preferences.h

src/corelib/screensaver.cpp

src/corelib/screensaver.h

src/corelib/subtracks.cpp

src/corelib/subtracks.h

src/corelib/trackdata.cpp

src/corelib/trackdata.h

src/corelib/tracks.cpp

src/corelib/tracks.h

src/encodings.cpp

src/encodings.h

src/old-code

src/old-code/aboutdialog.cpp

src/old-code/aboutdialog.h

src/old-code/floatingcontrol.cpp

src/old-code/floatingcontrol.h

src/old-code/main.cpp

src/translations/qt_fr.qm

src/translations/qt_fr.ts

files modified:
Changelog

Install.txt

Makefile

Readme.txt

Release_notes.txt

clean_windows.bat

compile_windows_with_qxt.bat

create_deb.sh

create_rpm.sh

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/docs

debian-rvm/rules

docs/en/faq.html

docs/ja/faq.html

get_svn_revision.sh

getrev/getrev.pro

man/smplayer.1

setup/install_smplayer.bat

setup/smplayer.iss

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

src/about.ui

src/actionseditor.cpp

src/actionseditor.h

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/baseguiplus.h

src/clhelp.cpp

src/clhelp.h

src/corelib/smplayercore.pro

src/defaultgui.cpp

src/defaultgui.h

src/eqslider.cpp

src/eqslider.h

src/eqslider.ui

src/errordialog.cpp

src/errordialog.h

src/errordialog.ui

src/extensions.cpp

src/extensions.h

src/filechooser.cpp

src/filechooser.h

src/filechooser.ui

src/filedialog.cpp

src/filedialog.h

src/filepropertiesdialog.cpp

src/filepropertiesdialog.h

src/filepropertiesdialog.ui

src/floatingwidget.cpp

src/floatingwidget.h

src/guiconfig.h

src/icons.qrc

src/images.cpp

src/images.h

src/infofile.cpp

src/infofile.h

src/inforeader.cpp

src/inforeader.h

src/input.conf

src/inputdvddirectory.cpp

src/inputdvddirectory.h

src/inputdvddirectory.ui

src/inputmplayerversion.cpp

src/inputmplayerversion.h

src/inputmplayerversion.ui

src/inputurl.cpp

src/inputurl.h

src/inputurl.ui

src/logwindow.cpp

src/logwindow.h

src/logwindowbase.ui

src/main.cpp

src/minigui.cpp

src/minigui.h

src/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myclient.cpp

src/myclient.h

src/mycombobox.cpp

src/mycombobox.h

src/myserver.cpp

src/myserver.h

src/myslider.cpp

src/myslider.h

src/mytablewidget.cpp

src/mytablewidget.h

src/playlist.cpp

src/playlist.h

src/playlistdock.cpp

src/playlistdock.h

src/playlistpreferences.cpp

src/playlistpreferences.h

src/playlistpreferences.ui

src/prefadvanced.cpp

src/prefadvanced.h

src/prefadvanced.ui

src/prefassociations.cpp

src/prefassociations.h

src/prefassociations.ui

src/prefdrives.cpp

src/prefdrives.h

src/prefdrives.ui

src/preferencesdialog.cpp

src/preferencesdialog.h

src/preferencesdialog.ui

src/prefgeneral.cpp

src/prefgeneral.h

src/prefgeneral.ui

src/prefinput.cpp

src/prefinput.h

src/prefinput.ui

src/prefinterface.cpp

src/prefinterface.h

src/prefinterface.ui

src/prefperformance.cpp

src/prefperformance.h

src/prefperformance.ui

src/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

src/prefwidget.cpp

src/prefwidget.h

src/recents.cpp

src/recents.h

src/seekwidget.cpp

src/seekwidget.h

src/seekwidget.ui

src/shortcutgetter.cpp

src/shortcutgetter.h

src/shortcuts/default.keys

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/timedialog.cpp

src/timedialog.h

src/timedialog.ui

src/timeslider.cpp

src/timeslider.h

src/translations/smplayer_bg.ts

src/translations/smplayer_ca.ts

src/translations/smplayer_cs.ts

src/translations/smplayer_de.ts

src/translations/smplayer_el_GR.ts

src/translations/smplayer_en_US.ts

src/translations/smplayer_es.ts

src/translations/smplayer_eu.ts

src/translations/smplayer_fi.ts

src/translations/smplayer_fr.ts

src/translations/smplayer_hu.ts

src/translations/smplayer_it.ts

src/translations/smplayer_ja.ts

src/translations/smplayer_ka.ts

src/translations/smplayer_ko.ts

src/translations/smplayer_mk.ts

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.ts

src/translations/smplayer_pt_BR.ts

src/translations/smplayer_pt_PT.ts

src/translations/smplayer_ro_RO.ts

src/translations/smplayer_ru_RU.ts

src/translations/smplayer_sk.ts

src/translations/smplayer_sr.ts

src/translations/smplayer_sv.ts

src/translations/smplayer_tr.ts

src/translations/smplayer_uk_UA.ts

src/translations/smplayer_zh_CN.ts

src/translations/smplayer_zh_TW.ts

src/translator.cpp

src/translator.h

src/tristatecombo.cpp

src/tristatecombo.h

src/version.cpp

src/version.h

src/videoequalizer.cpp

src/videoequalizer.h

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

Show diffs side-by-side

added added

removed removed

src/playlist.cpp

/* smplayer, GUI front-end for mplayer.

This program is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

#else

automatically_get_info = true;

#endif

play_files_from_start = true;

modified = false;

createActions();

createToolbar();

connect( core, SIGNAL(mediaFinished()), this, SLOT(playNext()) );

connect( core, SIGNAL(mediaFinished()), this, SLOT(playNext()), Qt::QueuedConnection );

connect( core, SIGNAL(mediaLoaded()), this, SLOT(getMediaInfo()) );

QVBoxLayout *layout = new QVBoxLayout;

111

112

#endif

112

113

114

setAcceptDrops(true);

115

setAttribute(Qt::WA_NoMousePropagation);

114

116

115

117

// Random seed

116

118

QTime t;

138

140

139

141

void Playlist::createTable() {

140

142

listView = new MyTableWidget( 0, COL_TIME + 1, this);

143

listView->setObjectName("playlist_table");

141

144

listView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );

142

145

listView->setSelectionBehavior(QAbstractItemView::SelectRows);

143

146

listView->setSelectionMode(QAbstractItemView::ExtendedSelection);

151

154

listView->horizontalHeader()->setResizeMode(COL_TIME, QHeaderView::ResizeToContents);

152

155

listView->horizontalHeader()->setResizeMode(COL_PLAY, QHeaderView::ResizeToContents);

153

156

154

listView->setIconSize( Images::icon("ok_small").size() );

157

listView->setIconSize( Images::icon("ok").size() );

155

158

156

159

#if DRAG_ITEMS

157

160

listView->setSelectionMode(QAbstractItemView::SingleSelection);

335

338

}

336

339

337

340

void Playlist::updateView() {

341

qDebug("Playlist::updateView");

342

338

343

listView->setRowCount( pl.count() );

339

344

340

345

//QString number;

347

352

time = Helper::formatTime( (int) pl[n].duration() );

348

353

349

354

//listView->setText(n, COL_POS, number);

350

qDebug("name: '%s'", name.toUtf8().data());

355

qDebug("Playlist::updateView: name: '%s'", name.toUtf8().data());

351

356

listView->setText(n, COL_NAME, name);

352

357

listView->setText(n, COL_TIME, time);

353

358

354

359

if (pl[n].played()) {

355

listView->setIcon(n, COL_PLAY, Images::icon("ok_small") );

360

listView->setIcon(n, COL_PLAY, Images::icon("ok") );

356

361

} else {

357

362

listView->setIcon(n, COL_PLAY, QPixmap() );

358

363

}

422

427

#endif

423

428

424

429

// Test if already is in the list

425

bool exists = FALSE;

426

PlaylistItemList::iterator it;

427

for ( it = pl.begin(); it != pl.end(); ++it ) {

428

if ( (*it).filename() == filename ) {

429

exists = TRUE;

430

bool exists = false;

431

for ( int n = 0; n < pl.count(); n++) {

432

if ( pl[n].filename() == filename ) {

433

exists = true;

434

int last_item = pl.count()-1;

435

pl.move(n, last_item);

436

qDebug("Playlist::addItem: item already in list (%d), moved to %d", n, last_item);

437

if (current_item > -1) {

438

if (current_item > n) current_item--;

439

else

440

if (current_item == n) current_item = last_item;

441

}

430

442

break;

431

443

}

432

444

}

434

446

if (!exists) {

435

447

if (name.isEmpty()) {

436

448

QFileInfo fi(filename);

437

if (fi.exists()) {

449

// Let's see if it looks like a file (no dvd://1 or something)

450

if (filename.indexOf(QRegExp("^.*://.*")) == -1) {

438

451

// Local file

439

452

name = fi.fileName(); //fi.baseName(TRUE);

440

453

} else {

445

458

pl.append( PlaylistItem(filename, name, duration) );

446

459

//setModified( true ); // Better set the modified on a higher level

447

460

} else {

448

qDebug(" Not added. File already in the list");

461

qDebug("Playlist::addItem: item not added, already in the list");

449

462

}

450

463

}

451

464

767

780

qDebug("Playlist::playItem: %d (count:%d)", n, pl.count());

768

781

769

782

if ( (n >= pl.count()) || (n < 0) ) {

770

qDebug(" out of range");

783

qDebug("Playlist::playItem: out of range");

771

784

emit playlistEnded();

772

785

return;

773

786

}

780

793

if (!filename.isEmpty()) {

781

794

//pl[n].setPlayed(TRUE);

782

795

setCurrentItem(n);

783

core->open(filename, 0);

796

if (play_files_from_start)

797

core->open(filename, 0);

798

else

799

core->open(filename);

784

800

}

785

801

786

802

}

810

826

811

827

void Playlist::playPrev() {

812

828

qDebug("Playlist::playPrev");

813

playItem( current_item-1 );

829

if (current_item > 0) {

830

playItem( current_item-1 );

831

} else {

832

if (pl.count() > 1) playItem( pl.count() -1 );

833

}

814

834

}

815

835

816

836

void Playlist::getMediaInfo() {

898

918

if ( (get_info) && (QFile::exists((*it))) ) {

899

919

data = InfoProvider::getInfo( (*it) );

900

920

addItem( (*it), data.displayName(), data.duration );

901

updateView();

902

qApp->processEvents();

921

//updateView();

922

//qApp->processEvents();

903

923

} else {

904

924

addItem( (*it), "", 0 );

905

925

}

907

927

addItem( (*it), "", 0 );

908

928

#endif

909

929

910

// FIXME: set latest_dir only if the file is a local file,

911

// to avoid that dvd:, vcd: and so on will be used.

912

/* latest_dir = QFileInfo((*it)).dirPath(TRUE); */

930

if (QFile::exists(*it)) {

931

latest_dir = QFileInfo((*it)).absolutePath();

932

}

933

913

934

++it;

914

935

}

915

936

#if USE_INFOPROVIDER

917

938

#endif

918

939

updateView();

919

940

920

qDebug( " * latest_dir: '%s'", latest_dir.toUtf8().data() );

941

qDebug( "Playlist::addFiles: latest_dir: '%s'", latest_dir.toUtf8().constData() );

921

942

}

922

943

923

944

void Playlist::addFile(QString file, AutoGetInfo auto_get_info) {

1136

1157

d.setDirectoryRecursion(recursive_add_directory);

1137

1158

d.setAutoGetInfo(automatically_get_info);

1138

1159

d.setSavePlaylistOnExit(save_playlist_in_config);

1160

d.setPlayFilesFromStart(play_files_from_start);

1139

1161

1140

1162

if (d.exec() == QDialog::Accepted) {

1141

1163

recursive_add_directory = d.directoryRecursion();

1142

1164

automatically_get_info = d.autoGetInfo();

1143

1165

save_playlist_in_config = d.savePlaylistOnExit();

1166

play_files_from_start = d.playFilesFromStart();

1144

1167

}

1145

1168

}

1146

1169

1223

1246

set->setValue( "auto_get_info", automatically_get_info );

1224

1247

set->setValue( "recursive_add_directory", recursive_add_directory );

1225

1248

set->setValue( "save_playlist_in_config", save_playlist_in_config );

1249

set->setValue( "play_files_from_start", play_files_from_start );

1226

1250

1227

//#if !DOCK_PLAYLIST

1228

set->setValue( "window_width", size().width() );

1229

set->setValue( "window_height", size().height() );

1230

//#endif

1251

#if !DOCK_PLAYLIST

1252

set->setValue( "size", size() );

1253

#endif

1231

1254

set->setValue( "latest_dir", latest_dir );

1232

1255

1233

1256

set->endGroup();

1262

1285

automatically_get_info = set->value( "auto_get_info", automatically_get_info ).toBool();

1263

1286

recursive_add_directory = set->value( "recursive_add_directory", recursive_add_directory ).toBool();

1264

1287

save_playlist_in_config = set->value( "save_playlist_in_config", save_playlist_in_config ).toBool();

1288

play_files_from_start = set->value( "play_files_from_start", play_files_from_start ).toBool();

1265

1289

1266

//#if !DOCK_PLAYLIST

1267

QSize s;

1268

s.setWidth( set->value( "window_width", size().width() ).toInt() );

1269

s.setHeight( set->value( "window_height", size().height() ).toInt() );

1270

resize( s );

1271

//#endif

1290

#if !DOCK_PLAYLIST

1291

resize( set->value("size", size()).toSize() );

1292

#endif

1272

1293

1273

1294

latest_dir = set->value( "latest_dir", latest_dir ).toString();

1274

1295

Older »