~ubuntu-branches/debian/stretch/smplayer/stretch

Viewing changes to .pc/01-add-mplayer2-detection.patch/src/core.cpp

Committer: Package Import Robot
Author(s): Mateusz Łukasik
Date: 2014-04-21 11:53:59 UTC
mfrom: (1.3.2)
Revision ID: package-import@ubuntu.com-20140421115359-oz572avkq20ieqaf

Tags: 14.3.0-1

http://bugs.debian.org/740769

http://bugs.debian.org/742685

http://bugs.debian.org/698365

* Add myself to uploaders.
* New upstream release. (Closes: #740769, #742685)
* debian/control:
- bump standards version to 3.9.5. (no changes needed)
- rename smplayer-translations to smplayer-l10n. (Closes: #698365)

files added:
debian/smplayer-l10n.install

qt-translations/qt_ja.qm

qt-translations/qt_ja.ts

setup/translations/albanian.nsh

setup/translations/arabic.nsh

setup/translations/bulgarian.nsh

setup/translations/malay.nsh

setup/translations/po_files

setup/translations/po_files/.tx

setup/translations/po_files/.tx/config

setup/translations/po_files/albanian.po

setup/translations/po_files/arabic.po

setup/translations/po_files/basque.po

setup/translations/po_files/bulgarian.po

setup/translations/po_files/catalan.po

setup/translations/po_files/croatian.po

setup/translations/po_files/czech.po

setup/translations/po_files/danish.po

setup/translations/po_files/dutch.po

setup/translations/po_files/english.pot

setup/translations/po_files/finnish.po

setup/translations/po_files/french.po

setup/translations/po_files/german.po

setup/translations/po_files/hebrew.po

setup/translations/po_files/hungarian.po

setup/translations/po_files/italian.po

setup/translations/po_files/japanese.po

setup/translations/po_files/korean.po

setup/translations/po_files/malay.po

setup/translations/po_files/norwegian.po

setup/translations/po_files/polish.po

setup/translations/po_files/portuguese.po

setup/translations/po_files/portuguesebrazil.po

setup/translations/po_files/russian.po

setup/translations/po_files/serbian.po

setup/translations/po_files/simpchinese.po

setup/translations/po_files/slovak.po

setup/translations/po_files/slovenian.po

setup/translations/po_files/spanish.po

setup/translations/po_files/thai.po

setup/translations/po_files/tradchinese.po

setup/translations/portuguesebrazil.nsh

setup/translations/serbian.nsh

src/autohidewidget.cpp

src/autohidewidget.h

src/icons-png/bluray.png

src/icons-png/bluray_drive.png

src/icons-png/paypal.png

src/icons-png/social_facebook.png

src/icons-png/social_twitter.png

src/icons-png/type_bluray.png

src/old

src/old/floatingwidget.cpp

src/old/floatingwidget.h

src/old/videoequalizer.cpp

src/old/videoequalizer.h

src/reminderdialog.cpp

src/reminderdialog.h

src/reminderdialog.ui

src/sharedialog.cpp

src/sharedialog.h

src/sharedialog.ui

src/shortcuts/euskara.keys

src/translations/smplayer_ar.ts

src/translations/smplayer_en_GB.ts

src/translations/smplayer_id.ts

src/translations/smplayer_nn_NO.ts

src/translations/smplayer_uz.ts

src/videoequalizer.ui

files removed:
debian/smplayer-translations.install

setup/scripts/make_pkgs64.cmd

src/floatingwidget.cpp

src/floatingwidget.h

src/simplehttp.cpp

src/simplehttp.h

src/videoequalizer2.cpp

src/videoequalizer2.h

src/videoequalizer2.ui

files modified:
.pc/01-add-mplayer2-detection.patch/src/core.cpp

.pc/02-disable_updates.patch/src/updatechecker.cpp

Changelog

Readme.txt

Release_notes.txt

create_deb.sh

debian-rvm/changelog-orig

debian/changelog

debian/control

qt-translations/qt_eu.qm

qt-translations/qt_eu.ts

setup/scripts/make_pkgs.cmd

setup/smplayer.nsi

setup/translations/basque.nsh

setup/translations/catalan.nsh

setup/translations/croatian.nsh

setup/translations/czech.nsh

setup/translations/danish.nsh

setup/translations/dutch.nsh

setup/translations/english.nsh

setup/translations/finnish.nsh

setup/translations/french.nsh

setup/translations/german.nsh

setup/translations/hebrew.nsh

setup/translations/hungarian.nsh

setup/translations/italian.nsh

setup/translations/japanese.nsh

setup/translations/korean.nsh

setup/translations/norwegian.nsh

setup/translations/polish.nsh

setup/translations/portuguese.nsh

setup/translations/russian.nsh

setup/translations/simpchinese.nsh

setup/translations/slovak.nsh

setup/translations/slovenian.nsh

setup/translations/spanish.nsh

setup/translations/thai.nsh

setup/translations/tradchinese.nsh

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

src/about.ui

src/actionseditor.cpp

src/actionseditor.h

src/assstyles.cpp

src/assstyles.h

src/audioequalizer.cpp

src/audioequalizer.h

src/audioequalizerlist.h

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/baseguiplus.h

src/chapters.cpp

src/chapters.h

src/cleanconfig.cpp

src/clhelp.cpp

src/clhelp.h

src/colorutils.cpp

src/colorutils.h

src/config.h

src/constants.h

src/core.cpp

src/core.h

src/defaultgui.cpp

src/defaultgui.h

src/desktopinfo.cpp

src/desktopinfo.h

src/deviceinfo.cpp

src/deviceinfo.h

src/discname.cpp

src/discname.h

src/editabletoolbar.cpp

src/editabletoolbar.h

src/eqslider.cpp

src/eqslider.h

src/errordialog.cpp

src/errordialog.h

src/extensions.cpp

src/extensions.h

src/favoriteeditor.cpp

src/favoriteeditor.h

src/favorites.cpp

src/favorites.h

src/filechooser.cpp

src/filechooser.h

src/filedialog.cpp

src/filedialog.h

src/filehash.cpp

src/filehash.h

src/filepropertiesdialog.cpp

src/filepropertiesdialog.h

src/filesettings.cpp

src/filesettings.h

src/filesettingsbase.cpp

src/filesettingsbase.h

src/filesettingshash.cpp

src/filesettingshash.h

src/filters.cpp

src/filters.h

src/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

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/fixsubs.cpp

src/findsubtitles/fixsubs.h

src/findsubtitles/main.cpp

src/findsubtitles/osclient.cpp

src/findsubtitles/osclient.h

src/findsubtitles/osparser.cpp

src/findsubtitles/osparser.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/fontcache.cpp

src/fontcache.h

src/global.cpp

src/global.h

src/guiconfig.h

src/helper.cpp

src/helper.h

src/icons-png/cdrom_drive.png

src/icons-png/dvd_drive.png

src/icons.qrc

src/images.cpp

src/images.h

src/infofile.cpp

src/infofile.h

src/infoprovider.cpp

src/infoprovider.h

src/inforeader.cpp

src/inforeader.h

src/inputdvddirectory.cpp

src/inputdvddirectory.h

src/inputdvddirectory.ui

src/inputmplayerversion.cpp

src/inputmplayerversion.h

src/inputurl.cpp

src/inputurl.h

src/languages.cpp

src/languages.h

src/lineedit_with_icon.cpp

src/lineedit_with_icon.h

src/logwindow.cpp

src/logwindow.h

src/main.cpp

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/minigui.cpp

src/minigui.h

src/mpcgui/mpcgui.cpp

src/mpcgui/mpcgui.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerversion.cpp

src/mplayerversion.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/multilineinputdialog.cpp

src/multilineinputdialog.h

src/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myapplication.cpp

src/myapplication.h

src/mycombobox.cpp

src/mycombobox.h

src/mylineedit.cpp

src/mylineedit.h

src/myprocess.cpp

src/myprocess.h

src/myslider.cpp

src/myslider.h

src/mytablewidget.cpp

src/mytablewidget.h

src/paths.cpp

src/paths.h

src/playlist.cpp

src/playlist.h

src/playlistdock.cpp

src/playlistdock.h

src/prefadvanced.cpp

src/prefadvanced.h

src/prefadvanced.ui

src/prefassociations.cpp

src/prefassociations.h

src/prefdrives.cpp

src/prefdrives.h

src/prefdrives.ui

src/preferences.cpp

src/preferences.h

src/preferencesdialog.cpp

src/preferencesdialog.h

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/prefplaylist.cpp

src/prefplaylist.h

src/prefplaylist.ui

src/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

src/preftv.cpp

src/preftv.h

src/prefupdates.cpp

src/prefupdates.h

src/prefupdates.ui

src/prefwidget.cpp

src/prefwidget.h

src/qtsingleapplication/qtlocalpeer.cpp

src/qtsingleapplication/qtlocalpeer.h

src/qtsingleapplication/qtlockedfile.cpp

src/qtsingleapplication/qtlockedfile.h

src/qtsingleapplication/qtlockedfile_unix.cpp

src/qtsingleapplication/qtlockedfile_win.cpp

src/qtsingleapplication/qtsingleapplication.cpp

src/qtsingleapplication/qtsingleapplication.h

src/qtsingleapplication/qtsingleapplication.pri

src/qtsingleapplication/qtsinglecoreapplication.cpp

src/qtsingleapplication/qtsinglecoreapplication.h

src/recents.cpp

src/recents.h

src/screensaver.cpp

src/screensaver.h

src/seekwidget.cpp

src/seekwidget.h

src/seekwidget.ui

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcutgetter.cpp

src/shortcutgetter.h

src/shortcuts/default.keys

src/skingui/actiontools.cpp

src/skingui/actiontools.h

src/skingui/mediabarpanel.cpp

src/skingui/mediabarpanel.h

src/skingui/mediapanel.cpp

src/skingui/mediapanel.h

src/skingui/mybutton.cpp

src/skingui/mybutton.h

src/skingui/myicon.cpp

src/skingui/myicon.h

src/skingui/panelseeker.cpp

src/skingui/panelseeker.h

src/skingui/playcontrol.cpp

src/skingui/playcontrol.h

src/skingui/qpropertysetter.cpp

src/skingui/qpropertysetter.h

src/skingui/skingui.cpp

src/skingui/skingui.h

src/skingui/volumecontrolpanel.cpp

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/smplayer.rc

src/subtracks.cpp

src/subtracks.h

src/timedialog.cpp

src/timedialog.h

src/timeslider.cpp

src/timeslider.h

src/titletracks.cpp

src/titletracks.h

src/toolbareditor.cpp

src/toolbareditor.h

src/tracks.cpp

src/tracks.h

src/translations/.tx/config

src/translations/smplayer_ar_SY.ts

src/translations/smplayer_bg.ts

src/translations/smplayer_ca.ts

src/translations/smplayer_cs.ts

src/translations/smplayer_da.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_et.ts

src/translations/smplayer_eu.ts

src/translations/smplayer_fi.ts

src/translations/smplayer_fr.ts

src/translations/smplayer_gl.ts

src/translations/smplayer_he_IL.ts

src/translations/smplayer_hr.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_ku.ts

src/translations/smplayer_lt.ts

src/translations/smplayer_mk.ts

src/translations/smplayer_ms_MY.ts

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.ts

src/translations/smplayer_pt.ts

src/translations/smplayer_pt_BR.ts

src/translations/smplayer_ro_RO.ts

src/translations/smplayer_ru_RU.ts

src/translations/smplayer_sk.ts

src/translations/smplayer_sl_SI.ts

src/translations/smplayer_sr.ts

src/translations/smplayer_sv.ts

src/translations/smplayer_th.ts

src/translations/smplayer_tr.ts

src/translations/smplayer_uk_UA.ts

src/translations/smplayer_vi_VN.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/tvlist.cpp

src/tvlist.h

src/tvsettings.cpp

src/tvsettings.h

src/updatechecker.cpp

src/updatechecker.h

src/urlhistory.cpp

src/urlhistory.h

src/vdpauproperties.cpp

src/vdpauproperties.h

src/version.cpp

src/version.h

src/videoequalizer.cpp

src/videoequalizer.h

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

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

src/youtube/codedownloader.cpp

src/youtube/codedownloader.h

src/youtube/retrieveyoutubeurl.cpp

src/youtube/retrieveyoutubeurl.h

src/youtube/ytsig.cpp

src/youtube/ytsig.h

Show diffs side-by-side

added added

removed removed

.pc/01-add-mplayer2-detection.patch/src/core.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

223

connect( proc, SIGNAL(receivedTitleIsMovie()),

224

this, SLOT(dvdTitleIsMovie()) );

225

#endif

226

227

connect( proc, SIGNAL(receivedForbiddenText()), this, SIGNAL(receivedForbidden()) );

228

227

229

connect( this, SIGNAL(stateChanged(Core::State)),

228

230

this, SLOT(watchState(Core::State)) );

229

231

244

246

mplayerwindow, SLOT(playingStarted()) );

245

247

246

248

#if DVDNAV_SUPPORT

247

connect( mplayerwindow, SIGNAL(mouseMoved(QPoint)),

249

connect( mplayerwindow->videoLayer(), SIGNAL(mouseMoved(QPoint)),

248

250

this, SLOT(dvdnavUpdateMousePos(QPoint)) );

249

251

#endif

250

252

257

259

#ifdef SCREENSAVER_OFF

258

260

// Windows or OS2 screensaver

259

261

win_screensaver = new WinScreenSaver();

260

#endif

261

#endif

262

263

#if DISCNAME_TEST

264

DiscName::test();

262

connect( this, SIGNAL(aboutToStartPlaying()), this, SLOT(disableScreensaver()) );

263

connect( proc, SIGNAL(processExited()), this, SLOT(enableScreensaver()) );

264

connect( proc, SIGNAL(error(QProcess::ProcessError)), this, SLOT(enableScreensaver()) );

265

#endif

265

266

#endif

266

267

268

#ifdef YOUTUBE_SUPPORT

402

403

QString str = QString("osd_show_text \"%1\" %2 %3\n").arg(text.toUtf8().constData()).arg(duration).arg(level);

403

404

if (!prefix.isEmpty()) str = prefix + " " + str;

404

405

qDebug("Core::displayTextOnOSD: command: '%s'", str.toUtf8().constData());

405

proc->write(str.toAscii());

406

proc->write(str.toLatin1());

406

407

}

407

408

}

408

409

467

468

469

}

469

470

else

471

#ifdef BLURAY_SUPPORT

472

if (file.toLower().startsWith("br:")) {

473

qDebug("Core::open: * identified as blu-ray");

474

openBluRay(file);

475

}

476

else

477

#endif

470

478

if (file.toLower().startsWith("vcd:")) {

471

479

qDebug("Core::open: * identified as vcd");

472

480

539

547

540

548

541

549

void Core::YTNoVideoUrl() {

542

emit showMessage( tr("Unable to locate the url of the video") );

543

}

550

emit showMessage( tr("Unable to locate the URL of the video") );

551

}

552

#endif

553

554

#if defined(Q_OS_WIN) || defined(Q_OS_OS2)

555

#ifdef SCREENSAVER_OFF

556

void Core::enableScreensaver() {

557

qDebug("Core::enableScreensaver");

558

if (pref->turn_screensaver_off) {

559

win_screensaver->enable();

560

}

561

}

562

563

void Core::disableScreensaver() {

564

qDebug("Core::disableScreensaver");

565

if (pref->turn_screensaver_off) {

566

win_screensaver->disable();

567

}

568

}

569

#endif

544

570

#endif

545

571

546

572

void Core::loadSub(const QString & sub ) {

605

631

QFileInfo fi(directory);

606

632

if ( (fi.exists()) && (fi.isDir()) ) {

607

633

pref->dvd_directory = directory;

608

pref->play_dvd_from_hd = TRUE;

634

pref->play_dvd_from_hd = true;

609

635

openDVD();

610

636

} else {

611

637

qDebug("Core::openDVD: directory '%s' is not valid", directory.toUtf8().data());

614

640

qDebug("Core::openDVD: directory is empty");

615

641

}

616

642

} else {

617

pref->play_dvd_from_hd = FALSE;

643

pref->play_dvd_from_hd = false;

618

644

openDVD();

619

645

}

620

646

}

755

781

initPlaying();

756

782

}

757

783

784

785

#ifdef BLURAY_SUPPORT

786

/**

787

* Opens a BluRay, taking advantage of mplayer's capabilities to do so.

788

789

void Core::openBluRay(QString bluray_url) {

790

qDebug("Core::openBluRay: '%s'", bluray_url.toUtf8().data());

791

792

//Checks

793

DiscData disc_data = DiscName::split(bluray_url);

794

QString folder = disc_data.device;

795

int title = disc_data.title;

796

797

if (title == -1) {

798

qWarning("Core::openBluRay: title invalid, not playing bluray");

799

return;

800

}

801

802

QFileInfo fi(folder);

803

if ( (!fi.exists()) || (!fi.isDir()) ) {

804

qWarning("Core::openBluRay: folder invalid, not playing bluray");

805

return;

806

}

807

808

if (proc->isRunning()) {

809

stopMplayer();

810

we_are_restarting = false;

811

}

812

813

// Save data of previous file:

814

#ifndef NO_USE_INI_FILES

815

saveMediaInfo();

816

#endif

817

818

mdat.reset();

819

mdat.filename = bluray_url;

820

mdat.type = TYPE_BLURAY;

821

822

mset.reset();

823

824

mset.current_title_id = title;

825

mset.current_chapter_id = firstChapter();

826

mset.current_angle_id = 1;

827

828

/* initializeMenus(); */

829

830

initPlaying();

831

}

832

#endif

833

758

834

void Core::openTV(QString channel_id) {

759

835

qDebug("Core::openTV: '%s'", channel_id.toUtf8().constData());

760

836

813

889

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

814

890

815

891

#ifdef YOUTUBE_SUPPORT

816

if (name.contains("youtube.com/watch", Qt::CaseInsensitive) ||

817

name.contains("youtu.be/", Qt::CaseInsensitive) ||

818

name.contains("y2u.be/", Qt::CaseInsensitive) )

819

{

820

qDebug("Core::openStream: youtube url detected");

821

if (name.startsWith("www.youtube.com")) name = "http://" + name;

822

if (name.startsWith("youtube.com")) name = "http://www." + name;

823

if (name.startsWith("youtu.be")) name = "http://" + name;

824

if (name.startsWith("y2u.be")) name = "http://" + name;

892

// Check if the stream is a youtube url

893

QString yt_full_url = yt->fullUrl(name);

894

if (!yt_full_url.isEmpty()) {

895

qDebug("Core::openStream: youtube url detected: %s", yt_full_url.toLatin1().constData());

896

name = yt_full_url;

825

897

yt->setPreferredQuality( (RetrieveYoutubeUrl::Quality) pref->yt_quality );

826

898

qDebug("Core::openStream: user_agent: '%s'", pref->yt_user_agent.toUtf8().constData());

827

899

if (!pref->yt_user_agent.isEmpty()) yt->setUserAgent(pref->yt_user_agent);

828

900

#ifdef YT_USE_SCRIPT

829

YTSig::setScriptFile( Paths::configPath() + "/ytcode.script" );

901

YTSig::setScriptFile( Paths::configPath() + "/yt.js" );

830

902

#endif

831

903

yt->fetchPage(name);

832

904

return;

1025

1097

mset.current_chapter_id = firstChapter();

1026

1098

}

1027

1099

1028

mdat.initialized = TRUE;

1100

mdat.initialized = true;

1029

1101

1030

1102

// MPlayer doesn't display the length in ID_LENGTH for audio CDs...

1031

1103

if ((mdat.duration == 0) && (mdat.type == TYPE_AUDIO_CD)) {

1131

1203

1132

1204

changeAspectRatio(mset.aspect_ratio_id);

1133

1205

1134

if (pref->global_volume) {

1135

bool was_muted = pref->mute;

1136

setVolume( pref->volume, true);

1137

if (was_muted) mute(true);

1206

if (pref->mplayer_additional_options.contains("-volume")) {

1207

qDebug("Core::finishRestart: don't set volume since -volume is used");

1138

1208

} else {

1139

bool was_muted = mset.mute;

1140

setVolume( mset.volume, true );

1141

if (was_muted) mute(true);

1209

if (pref->global_volume) {

1210

bool was_muted = pref->mute;

1211

setVolume( pref->volume, true);

1212

if (was_muted) mute(true);

1213

} else {

1214

bool was_muted = mset.mute;

1215

setVolume( mset.volume, true );

1216

if (was_muted) mute(true);

1217

}

1142

1218

}

1143

1219

1144

1220

if (pref->change_video_equalizer_on_startup && (mset.gamma != 0)) {

1207

1283

}

1208

1284

1209

1285

1210

void Core::play()

1211

{

1286

void Core::play() {

1212

1287

qDebug("Core::play");

1213

1288

1214

1289

if ((proc->isRunning()) && (state()==Paused)) {

1215

1290

tellmp("pause"); // Unpauses

1216

}

1291

}

1217

1292

else

1218

1293

if ((proc->isRunning()) && (state()==Playing)) {

1219

1294

// nothing to do, continue playing

1228

1303

}

1229

1304

1230

1305

restartPlay();

1306

} else {

1307

emit noFileToPlay();

1231

1308

}

1232

}

1309

}

1233

1310

}

1234

1311

1235

1312

void Core::pause_and_frame_step() {

1301

1378

void Core::processFinished()

1302

1379

{

1303

1380

qDebug("Core::processFinished");

1304

1305

#if defined(Q_OS_WIN) || defined(Q_OS_OS2)

1306

#ifdef SCREENSAVER_OFF

1307

// Restores the Windows or OS2 screensaver

1308

if (pref->turn_screensaver_off) {

1309

win_screensaver->enable();

1310

}

1311

#endif

1312

#endif

1313

1314

1381

qDebug("Core::processFinished: we_are_restarting: %d", we_are_restarting);

1315

1382

1316

1383

//mset.current_sec = 0;

1395

1462

yt->close();

1396

1463

#endif

1397

1464

1398

#if defined(Q_OS_WIN) || defined(Q_OS_OS2)

1399

#ifdef SCREENSAVER_OFF

1400

// Disable the Windows or OS2 screensaver

1401

if (pref->turn_screensaver_off) {

1402

win_screensaver->disable();

1403

}

1404

#endif

1405

#endif

1406

1407

1465

bool is_mkv = (QFileInfo(file).suffix().toLower() == "mkv");

1408

1466

1409

1467

// DVD

1428

1486

qDebug("Core::startMplayer: checking if stream is a playlist");

1429

1487

qDebug("Core::startMplayer: url path: '%s'", url.path().toUtf8().constData());

1430

1488

1431

QRegExp rx("\\.ram$|\\.asx$|\\.m3u$|\\.pls$", Qt::CaseInsensitive);

1432

url_is_playlist = (rx.indexIn(url.path()) != -1);

1489

if (url.scheme().toLower() != "ffmpeg") {

1490

QRegExp rx("\\.ram$|\\.asx$|\\.m3u$|\\.m3u8$|\\.pls$", Qt::CaseInsensitive);

1491

url_is_playlist = (rx.indexIn(url.path()) != -1);

1492

}

1433

1493

}

1434

1494

qDebug("Core::startMplayer: url_is_playlist: %d", url_is_playlist);

1435

1495

1436

1496

1497

// Check if a m4a file exists with the same name of file, in that cause if will be used as audio

1498

if (pref->autoload_m4a && mset.external_audio.isEmpty()) {

1499

QFileInfo fi(file);

1500

if (fi.exists() && !fi.isDir()) {

1501

if (fi.suffix().toLower() == "mp4") {

1502

QString file2 = fi.path() + "/" + fi.completeBaseName() + ".m4a";

1503

//qDebug("Core::startMplayer: file2: %s", file2.toUtf8().constData());

1504

if (!QFile::exists(file2)) {

1505

// Check for upper case

1506

file2 = fi.path() + "/" + fi.completeBaseName() + ".M4A";

1507

}

1508

if (QFile::exists(file2)) {

1509

qDebug("Core::startMplayer: found %s, so it will be used as audio file", file2.toUtf8().constData());

1510

mset.external_audio = file2;

1511

}

1512

}

1513

}

1514

}

1515

1516

1437

1517

bool screenshot_enabled = ( (pref->use_screenshot) &&

1438

1518

(!pref->screenshot_directory.isEmpty()) &&

1439

1519

(QFileInfo(pref->screenshot_directory).isDir()) );

1735

1815

proc->addArgument( "-ass-font-scale");

1736

1816

proc->addArgument( QString::number(mset.sub_scale_ass) );

1737

1817

1818

if (!pref->mplayer_is_mplayer2) {

1819

proc->addArgument( "-noflip-hebrew" ); // It seems to be necessary to display arabic subtitles correctly when using -ass

1820

}

1821

1738

1822

if (!pref->force_ass_styles) {

1739

1823

// Load the styles.ass file

1740

1824

if (!QFile::exists(Paths::subtitleStyleFile())) {

1758

1842

}

1759

1843

// Use the same font for OSD

1760

1844

#if !defined(Q_OS_OS2)

1761

if (!pref->ass_styles.fontname.isEmpty()) {

1845

if ((pref->use_fontconfig) && (!pref->ass_styles.fontname.isEmpty())) {

1762

1846

#ifdef USE_FONTCONFIG_OPTIONS

1763

1847

if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2

1764

1848

proc->addArgument("-fontconfig");

1860

1944

proc->addArgument( QString::number( mset.current_video_id ) );

1861

1945

}

1862

1946

1863

if (mset.current_audio_id != MediaSettings::NoneSelected) {

1864

// Workaround for MPlayer bug #1321 (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1321)

1865

if (mdat.audios.numItems() != 1) {

1866

proc->addArgument("-aid");

1867

proc->addArgument( QString::number( mset.current_audio_id ) );

1947

if (mset.external_audio.isEmpty()) {

1948

if (mset.current_audio_id != MediaSettings::NoneSelected) {

1949

// Workaround for MPlayer bug #1321 (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1321)

1950

if (mdat.audios.numItems() != 1) {

1951

proc->addArgument("-aid");

1952

proc->addArgument( QString::number( mset.current_audio_id ) );

1953

}

1868

1954

}

1869

1955

}

1870

1956

1967

2053

// Set volume, requires mplayer svn r27872

1968

2054

bool use_volume_option = (MplayerVersion::isMplayerAtLeast(27872));

1969

2055

1970

if (pref->global_volume) {

1971

if (use_volume_option) {

1972

proc->addArgument("-volume");

1973

proc->addArgument( QString::number( pref->volume ) );

1974

}

2056

if (pref->mplayer_additional_options.contains("-volume")) {

2057

qDebug("Core::startMplayer: don't set volume since -volume is used");

1975

2058

} else {

1976

if (use_volume_option) {

1977

proc->addArgument("-volume");

1978

// Note: mset.volume may not be right, it can be the volume of the previous video if

1979

// playing a new one, but I think it's better to use anyway the current volume on

1980

// startup than set it to 0 or something.

1981

// The right volume will be set later, when the video starts to play.

1982

proc->addArgument( QString::number( mset.volume ) );

2059

if (pref->global_volume) {

2060

if (use_volume_option) {

2061

proc->addArgument("-volume");

2062

proc->addArgument( QString::number( pref->volume ) );

2063

}

2064

} else {

2065

if (use_volume_option) {

2066

proc->addArgument("-volume");

2067

// Note: mset.volume may not be right, it can be the volume of the previous video if

2068

// playing a new one, but I think it's better to use anyway the current volume on

2069

// startup than set it to 0 or something.

2070

// The right volume will be set later, when the video starts to play.

2071

proc->addArgument( QString::number( mset.volume ) );

2072

}

1983

2073

}

1984

2074

}

1985

2075

2018

2108

switch (mdat.type) {

2019

2109

case TYPE_FILE : cache = pref->cache_for_files; break;

2020

2110

case TYPE_DVD : cache = pref->cache_for_dvds;

2021

#if DVDNAV_SUPPORT

2111

#if DVDNAV_SUPPORT

2022

2112

if (file.startsWith("dvdnav:")) cache = 0;

2023

#endif

2113

#endif

2024

2114

break;

2025

2115

case TYPE_STREAM : cache = pref->cache_for_streams; break;

2026

2116

case TYPE_VCD : cache = pref->cache_for_vcds; break;

2027

2117

case TYPE_AUDIO_CD : cache = pref->cache_for_audiocds; break;

2028

2118

case TYPE_TV : cache = pref->cache_for_tv; break;

2119

#ifdef BLURAY_SUPPORT

2120

case TYPE_BLURAY : cache = pref->cache_for_dvds; break; // FIXME: use cache for bluray?

2121

#endif

2029

2122

default: cache = 0;

2030

2123

}

2031

2124

2311

2404

// Audio equalizer

2312

2405

if (pref->use_audio_equalizer) {

2313

2406

if (!af.isEmpty()) af += ",";

2314

af += "equalizer=" + Helper::equalizerListToString(mset.audio_equalizer);

2407

AudioEqualizerList l = pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer;

2408

af += "equalizer=" + Helper::equalizerListToString(l);

2315

2409

}

2316

2410

2317

2411

2349

2443

QFileInfo f(file);

2350

2444

QString basename = f.path() + "/" + f.completeBaseName();

2351

2445

2352

qDebug("Core::startMplayer: file basename: '%s'", basename.toUtf8().data());

2446

//qDebug("Core::startMplayer: file basename: '%s'", basename.toUtf8().data());

2353

2447

2354

2448

if (QFile::exists(basename+".edl"))

2355

2449

edl_f = basename+".edl";

2418

2512

//Log command

2419

2513

QString line_for_log = commandline + "\n";

2420

2514

emit logLineAvailable(line_for_log);

2421

2515

2516

#ifdef Q_OS_WIN

2517

if (!pref->use_windowsfontdir) {

2518

QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

2519

env.insert("FONTCONFIG_FILE", Paths::configPath() + "/fonts.conf");

2520

proc->setProcessEnvironment(env);

2521

}

2522

#endif

2422

2523

if ( !proc->start() ) {

2423

2524

// error handling

2424

2525

qWarning("Core::startMplayer: mplayer process didn't start");

2889

2990

}

2890

2991

2891

2992

void Core::incBrightness() {

2892

setBrightness(mset.brightness + 4);

2993

setBrightness(mset.brightness + pref->min_step);

2893

2994

}

2894

2995

2895

2996

void Core::decBrightness() {

2896

setBrightness(mset.brightness - 4);

2997

setBrightness(mset.brightness - pref->min_step);

2897

2998

}

2898

2999

2899

3000

void Core::incContrast() {

2900

setContrast(mset.contrast + 4);

3001

setContrast(mset.contrast + pref->min_step);

2901

3002

}

2902

3003

2903

3004

void Core::decContrast() {

2904

setContrast(mset.contrast - 4);

3005

setContrast(mset.contrast - pref->min_step);

2905

3006

}

2906

3007

2907

3008

void Core::incGamma() {

2908

setGamma(mset.gamma + 4);

3009

setGamma(mset.gamma + pref->min_step);

2909

3010

}

2910

3011

2911

3012

void Core::decGamma() {

2912

setGamma(mset.gamma - 4);

3013

setGamma(mset.gamma - pref->min_step);

2913

3014

}

2914

3015

2915

3016

void Core::incHue() {

2916

setHue(mset.hue + 4);

3017

setHue(mset.hue + pref->min_step);

2917

3018

}

2918

3019

2919

3020

void Core::decHue() {

2920

setHue(mset.hue - 4);

3021

setHue(mset.hue - pref->min_step);

2921

3022

}

2922

3023

2923

3024

void Core::incSaturation() {

2924

setSaturation(mset.saturation + 4);

3025

setSaturation(mset.saturation + pref->min_step);

2925

3026

}

2926

3027

2927

3028

void Core::decSaturation() {

2928

setSaturation(mset.saturation - 4);

3029

setSaturation(mset.saturation - pref->min_step);

2929

3030

}

2930

3031

2931

3032

void Core::setSpeed( double value ) {

3040

3141

3041

3142

void Core::incVolume() {

3042

3143

qDebug("Core::incVolume");

3043

int new_vol = (pref->global_volume ? pref->volume + 4 : mset.volume + 4);

3144

int new_vol = (pref->global_volume ? pref->volume + pref->min_step : mset.volume + pref->min_step);

3044

3145

setVolume(new_vol);

3045

3146

}

3046

3147

3047

3148

void Core::decVolume() {

3048

3149

qDebug("Core::incVolume");

3049

int new_vol = (pref->global_volume ? pref->volume - 4 : mset.volume - 4);

3150

int new_vol = (pref->global_volume ? pref->volume - pref->min_step : mset.volume - pref->min_step);

3050

3151

setVolume(new_vol);

3051

3152

}

3052

3153

3198

3299

3199

3300

// Audio equalizer functions

3200

3301

void Core::setAudioEqualizer(AudioEqualizerList values, bool restart) {

3201

mset.audio_equalizer = values;

3302

if (pref->global_audio_equalizer) {

3303

pref->audio_equalizer = values;

3304

} else {

3305

mset.audio_equalizer = values;

3306

}

3202

3307

3203

3308

if (!restart) {

3204

3309

const char *command = "af_cmdline equalizer ";

3213

3318

}

3214

3319

3215

3320

void Core::updateAudioEqualizer() {

3216

setAudioEqualizer(mset.audio_equalizer);

3321

setAudioEqualizer(pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer);

3322

}

3323

3324

void Core::setAudioEq(int eq, int value) {

3325

if (pref->global_audio_equalizer) {

3326

pref->audio_equalizer[eq] = value;

3327

} else {

3328

mset.audio_equalizer[eq] = value;

3329

}

3330

updateAudioEqualizer();

3217

3331

}

3218

3332

3219

3333

void Core::setAudioEq0(int value) {

3220

mset.audio_equalizer[0] = value;

3221

updateAudioEqualizer();

3334

setAudioEq(0, value);

3222

3335

}

3223

3336

3224

3337

void Core::setAudioEq1(int value) {

3225

mset.audio_equalizer[1] = value;

3226

updateAudioEqualizer();

3338

setAudioEq(1, value);

3227

3339

}

3228

3340

3229

3341

void Core::setAudioEq2(int value) {

3230

mset.audio_equalizer[2] = value;

3231

updateAudioEqualizer();

3342

setAudioEq(2, value);

3232

3343

}

3233

3344

3234

3345

void Core::setAudioEq3(int value) {

3235

mset.audio_equalizer[3] = value;

3236

updateAudioEqualizer();

3346

setAudioEq(3, value);

3237

3347

}

3238

3348

3239

3349

void Core::setAudioEq4(int value) {

3240

mset.audio_equalizer[4] = value;

3241

updateAudioEqualizer();

3350

setAudioEq(4, value);

3242

3351

}

3243

3352

3244

3353

void Core::setAudioEq5(int value) {

3245

mset.audio_equalizer[5] = value;

3246

updateAudioEqualizer();

3354

setAudioEq(5, value);

3247

3355

}

3248

3356

3249

3357

void Core::setAudioEq6(int value) {

3250

mset.audio_equalizer[6] = value;

3251

updateAudioEqualizer();

3358

setAudioEq(6, value);

3252

3359

}

3253

3360

3254

3361

void Core::setAudioEq7(int value) {

3255

mset.audio_equalizer[7] = value;

3256

updateAudioEqualizer();

3362

setAudioEq(7, value);

3257

3363

}

3258

3364

3259

3365

void Core::setAudioEq8(int value) {

3260

mset.audio_equalizer[8] = value;

3261

updateAudioEqualizer();

3366

setAudioEq(8, value);

3262

3367

}

3263

3368

3264

3369

void Core::setAudioEq9(int value) {

3265

mset.audio_equalizer[9] = value;

3266

updateAudioEqualizer();

3370

setAudioEq(9, value);

3267

3371

}

3268

3372

3269

3373

3435

3539

// Workaround too for a mplayer problem in linux,

3436

3540

// the volume is reduced if using -softvol-max.

3437

3541

3438

if (pref->global_volume) {

3439

setVolume( pref->volume, true);

3440

if (pref->mute) mute(true);

3542

if (pref->mplayer_additional_options.contains("-volume")) {

3543

qDebug("Core::changeAudio: don't set volume since -volume is used");

3441

3544

} else {

3442

setVolume( mset.volume, true );

3443

if (mset.mute) mute(true); // if muted, mute again

3545

if (pref->global_volume) {

3546

setVolume( pref->volume, true);

3547

if (pref->mute) mute(true);

3548

} else {

3549

setVolume( mset.volume, true );

3550

if (mset.mute) mute(true); // if muted, mute again

3551

}

3444

3552

}

3445

3553

updateWidgets();

3446

3554

}

3544

3652

}

3545

3653

else

3546

3654

if (mdat.type == TYPE_DVD) {

3547

#if DVDNAV_SUPPORT

3655

#if DVDNAV_SUPPORT

3548

3656

if (mdat.filename.startsWith("dvdnav:")) {

3549

3657

tellmp("switch_title " + QString::number(ID));

3550

3658

} else {

3551

#endif

3659

#endif

3552

3660

DiscData disc_data = DiscName::split(mdat.filename);

3553

3661

disc_data.title = ID;

3554

3662

QString dvd_url = DiscName::join(disc_data);

3555

3663

3556

3664

openDVD( DiscName::join(disc_data) );

3557

#if DVDNAV_SUPPORT

3665

#if DVDNAV_SUPPORT

3558

3666

}

3667

#endif

3668

}

3669

#ifdef BLURAY_SUPPORT

3670

else

3671

if (mdat.type == TYPE_BLURAY) {

3672

//DiscName::test();

3673

3674

DiscData disc_data = DiscName::split(mdat.filename);

3675

disc_data.title = ID;

3676

QString bluray_url = DiscName::join(disc_data);

3677

qDebug("Core::changeTitle: bluray_url: %s", bluray_url.toUtf8().constData());

3678

openBluRay(bluray_url);

3679

}

3559

3680

#endif

3560

}

3561

3681

}

3562

3682

3563

3683

void Core::changeChapter(int ID) {

3679

3799

<< MediaSettings::Aspect11 // 1

3680

3800

<< MediaSettings::Aspect54 // 1.25

3681

3801

<< MediaSettings::Aspect43 // 1.33

3802

<< MediaSettings::Aspect118 // 1.37

3682

3803

<< MediaSettings::Aspect1410 // 1.4

3683

3804

<< MediaSettings::Aspect32 // 1.5

3684

3805

<< MediaSettings::Aspect149 // 1.55

3708

3829

if(a==32)

3709

3830

a = 2;

3710

3831

// See if we are done

3711

if(pref->wheel_function_cycle.testFlag(QFlag(a)))

3832

if (pref->wheel_function_cycle.testFlag((Preferences::WheelFunction)a))

3712

3833

done = true;

3713

3834

}

3714

3835

pref->wheel_function = a;

4083

4204

mplayerwindow->setResolution( mset.win_width, mset.win_height );

4084

4205

emit needResize( mset.win_width, mset.win_height );

4085

4206

4086

//mplayerwindow->showLogo(TRUE);

4207

//mplayerwindow->showLogo(true);

4087

4208

emit noVideo();

4088

4209

}

4089

4210

4342

4463

4343

4464

void Core::durationChanged(double length) {

4344

4465

qDebug("Core::durationChanged: %f", length);

4345

mdat.duration = length;

4466

if (mdat.duration != length) {

4467

mdat.duration = length;

4468

emit newDuration(length);

4469

}

4346

4470

}

4347

4471

4348

4472

void Core::askForInfo() {

4352

4476

}

4353

4477

4354

4478

void Core::dvdnavUpdateMousePos(QPoint pos) {

4479

//qDebug("Core::dvdnavUpdateMousePos");

4355

4480

if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:")) && (dvdnav_title_is_menu)) {

4356

4481

if (mplayerwindow->videoLayer()->underMouse()) {

4357

QPoint p = mplayerwindow->videoLayer()->mapFromParent(pos);

4358

tellmp(QString("set_mouse_pos %1 %2").arg(p.x()).arg(p.y()));

4482

tellmp(QString("set_mouse_pos %1 %2").arg(pos.x()).arg(pos.y()));

4359

4483

}

4360

4484

}

4361

4485

}

Older »