← Back to branch summary

~ubuntu-branches/debian/jessie/smplayer/jessie

~ubuntu-branches/debian/jessie/smplayer/jessie

« back to all changes in this revision

Viewing changes to src/mediasettings.cpp

Committer: Package Import Robot
Author(s): Alessio Treglia
Date: 2012-02-16 11:51:44 UTC
mfrom: (1.1.12)
Revision ID: package-import@ubuntu.com-20120216115144-hkpz36a4h5f3x9w3

Tags: 0.7.0-1

http://bugs.debian.org/655125

http://bugs.debian.org/610204

* Team upload.
* New upstream release (Closes: #655125):
  - Changes since 0.6.10:
    + New favorite menu, where you can add your favorite videos, music,
       streams, youtube videos... It's also possible to add submenus.
    + Support for youtube. Now you can open urls like
      http://www.youtube.com/watch?v=..... using the Open -> URL dialog or
      dragging a link from a browser to the smplayer window.
    + Support for mplayer2 (http://www.mplayer2.org). It's a fork of mplayer
      with interesting features like precise seeking, ordered chapters in
      mkv videos and better pause handling (e.g. seek works while the video
      is paused).
    + New translation: croatian.
  - Changes since 0.6.9:
    + New vdpau configuration dialog, which allow to select the vdpau codecs
      to use. (Closes: #610204)
    + Port for eCS, OS/2 (by Silvan Scherrer).
    + New menu to select the closed caption channel (requires mplayer >=
      r32607).
    + Possibility to select the seeking method (absolute or relative).
    + Possibility to sort the items of the playlist.
* Remove debian/patches/enable_ffodivxvdpau.diff, the application now
  provides a configuration dialog for vdpau.
* Refresh handle_local_urls.diff.
* Update copyright notice.

files added:
Copying_BSD.txt

build_os2.cmd

debian/gbp.conf

docs/zh_CN

docs/zh_CN/faq.html

docs/zh_CN/gpl.html

os2

os2/liesmich.os2

os2/lisezmoi.os2

os2/readme.os2

setup/scripts

setup/scripts/install_smplayer.cmd

setup/scripts/make_pkgs.cmd

setup/smplayer-orange-installer.ico

setup/smplayer-orange-uninstaller.ico

setup/smplayer-orange-wizard-un.bmp

setup/smplayer-orange-wizard.bmp

setup/smplayer.win32.nsi

setup/translations/croatian.nsh

setup/translations/japanese.nsh

setup/translations/korean.nsh

setup/translations/simpchinese.nsh

setup/translations/tradchinese.nsh

src/icons-png/bookmark_add.png

src/icons-png/bookmark_folder.png

src/icons-png/check_updates.png

src/icons-png/clear_left.png

src/icons-png/donate.png

src/icons-png/folder_open.png

src/icons-png/open_disc.png

src/icons-png/open_favorites.png

src/icons-png/trash.png

src/lineedit_with_icon.cpp

src/lineedit_with_icon.h

src/mylineedit.cpp

src/mylineedit.h

src/qtlockedfile

src/qtlockedfile/QtLockedFile

src/qtlockedfile/qtlockedfile.cpp

src/qtlockedfile/qtlockedfile.h

src/qtlockedfile/qtlockedfile.pri

src/qtlockedfile/qtlockedfile_unix.cpp

src/qtlockedfile/qtlockedfile_win.cpp

src/smplayer_os2.rc

src/translations/smplayer_da.ts

src/translations/smplayer_hr.ts

src/vdpauproperties.cpp

src/vdpauproperties.h

src/vdpauproperties.ui

src/youtube

src/youtube/retrieveyoutubeurl.cpp

src/youtube/retrieveyoutubeurl.h

files removed:
.pc/enable_ffodivxvdpau.diff

.pc/enable_ffodivxvdpau.diff/src

.pc/enable_ffodivxvdpau.diff/src/core.cpp

compile_windows_with_qxt.bat

debian/patches/enable_ffodivxvdpau.diff

old-txt

old-txt/Configurable_shortcuts.txt

old-txt/Icon_themes.txt

old-txt/Porting_log.txt

old-txt/Release_notes.txt

old-txt/Translations.txt

setup/Readme.txt

setup/install_smplayer.bat

setup/mplayer.codecs.win32.nsi

setup/smplayer-installer.nsi

setup/smplayer_orig.ini

src/corelib

src/corelib/smplayercore.pro

src/corelib/smplayercorelib.cpp

src/corelib/smplayercorelib.h

src/filechooser.ui

src/icons-png/tips.png

src/playlistpreferences.cpp

src/playlistpreferences.h

src/playlistpreferences.ui

src/shortcuts/sda.keys

src/testcorelib

src/testcorelib/test.cpp

src/testcorelib/test.h

src/testcorelib/test.pro

src/testcorelib/test2.cpp

files modified:
.pc/applied-patches

.pc/handle_local_urls.diff/src/smplayer.cpp

Changelog

Readme.txt

Release_notes.txt

create_deb.sh

debian-rvm/README

debian-rvm/README.Debian

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/copyright

debian/changelog

debian/control

debian/copyright

debian/patches/handle_local_urls.diff

debian/patches/series

debian/smplayer.install

dxlist/main.cpp

man/smplayer.1

setup/translations/basque.nsh

setup/translations/catalan.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/norwegian.nsh

setup/translations/polish.nsh

setup/translations/portuguese.nsh

setup/translations/russian.nsh

setup/translations/slovak.nsh

setup/translations/slovenian.nsh

setup/translations/spanish.nsh

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

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

src/eqslider.h

src/errordialog.cpp

src/errordialog.h

src/extensions.cpp

src/extensions.h

src/favoriteeditor.cpp

src/favoriteeditor.h

src/favoriteeditor.ui

src/favorites.cpp

src/favorites.h

src/filechooser.cpp

src/filechooser.h

src/filedialog.cpp

src/filedialog.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/findsubtitles.pro

src/findsubtitles/findsubtitlesconfigdialog.cpp

src/findsubtitles/findsubtitlesconfigdialog.h

src/findsubtitles/findsubtitleswindow.cpp

src/findsubtitles/findsubtitleswindow.h

src/findsubtitles/main.cpp

src/findsubtitles/osparser.cpp

src/findsubtitles/osparser.h

src/findsubtitles/simplehttp.cpp

src/findsubtitles/simplehttp.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/floatingwidget.cpp

src/floatingwidget.h

src/global.cpp

src/global.h

src/guiconfig.h

src/helper.cpp

src/helper.h

src/icons-png/pref_advanced.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/inputmplayerversion.cpp

src/inputmplayerversion.h

src/inputurl.cpp

src/inputurl.h

src/inputurl.ui

src/languages.cpp

src/languages.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/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myclient.cpp

src/myclient.h

src/mycombobox.cpp

src/mycombobox.h

src/myprocess.cpp

src/myprocess.h

src/myserver.cpp

src/myserver.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/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/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/preftv.cpp

src/preftv.h

src/prefwidget.cpp

src/prefwidget.h

src/recents.cpp

src/recents.h

src/screensaver.cpp

src/screensaver.h

src/seekwidget.cpp

src/seekwidget.h

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcutgetter.cpp

src/shortcutgetter.h

src/shortcuts/default.keys

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/smplayer_associations.ico

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/smplayer_ar_SY.ts

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_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_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_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_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/urlhistory.cpp

src/urlhistory.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/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

Show diffs side-by-side

added added

removed removed

src/mediasettings.cpp

1

1

/* smplayer, GUI front-end for mplayer.

2

Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>

2

Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>

3

3

4

4

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

5

5

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

56

56

sub_scale = pref->initial_sub_scale;

57

57

sub_scale_ass = pref->initial_sub_scale_ass;

58

58

59

closed_caption_channel = 0; // disabled

60

59

61

brightness = pref->initial_brightness;

60

62

contrast = pref->initial_contrast;

61

63

gamma = pref->initial_gamma;

193

195

qDebug(" sub_scale: %f", sub_scale);

194

196

qDebug(" sub_scale_ass: %f", sub_scale_ass);

195

197

198

qDebug(" closed_caption_channel: %d", closed_caption_channel);

199

196

200

qDebug(" brightness: %d", brightness);

197

201

qDebug(" contrast: %d", contrast);

198

202

qDebug(" gamma: %d", gamma);

285

289

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

286

290

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

287

291

292

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

293

288

294

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

289

295

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

290

296

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

380

386

sub_scale = set->value( "sub_scale", sub_scale).toDouble();

381

387

sub_scale_ass = set->value( "sub_scale_ass", sub_scale_ass).toDouble();

382

388

389

closed_caption_channel = set->value( "closed_caption_channel", closed_caption_channel).toInt();

390

383

391

brightness = set->value( "brightness", brightness).toInt();

384

392

contrast = set->value( "contrast", contrast).toInt();

385

393

gamma = set->value( "gamma", gamma).toInt();

Older »