← Back to branch summary

~ubuntu-branches/debian/experimental/smplayer/experimental

~ubuntu-branches/debian/experimental/smplayer/experimental

« back to all changes in this revision

Viewing changes to src/core.h

Committer: Bazaar Package Importer
Author(s): Maia Kozheva
Date: 2009-03-31 23:05:43 UTC
mfrom: (1.1.9 upstream) (3.1.2 squeeze)
Revision ID: james.westby@ubuntu.com-20090331230543-1ned1omblgt4qiak

http://bugs.debian.org/523791

http://bugs.debian.org/503295

http://bugs.debian.org/486314

http://bugs.debian.org/489375

* New upstream release. (Closes: #523791)
  - Reworked subtitle font preferences. (Closes: #503295)
  - No longer installs qt_fr.qm. (Closes: #486314)
* debian/control:
  - Bumped Standards-Version to 3.8.1.
  - Changed maintainer name (still the same person and GPG key).
  - Changed section to video.
  - Build-depend on zlib1g-dev for findsubtitles.
  - Require Qt >= 4.3 per readme.
  - Added ${misc:Depends}.
  - Make smplayer-translations depend on smplayer and smplayer recommend
    smplayer-translations, not the other way round. (Closes: #489375)
* debian/copyright:
  - Significantly expanded per-file with new upstream authors.
* debian/rules:
  - Make make use correct uic in install.
  - Clean svn_revision.
  - Removed get-orig-source - not needed with uscan --repack.
* debian/patches/01_gl_translation.patch:
  - Added patch to fix lrelease error on smplayer_gl.ts.
* Added debian/README.source for simple-patchsys.

files added:
debian/README.source

debian/patches

debian/patches/01_gl_translation.patch

dvdmenus.txt

setup/smplayer-installer.nsi

src/discname.cpp

src/discname.h

src/findsubtitles/findsubtitlesconfigdialog.cpp

src/findsubtitles/findsubtitlesconfigdialog.h

src/findsubtitles/findsubtitlesconfigdialog.ui

files removed:
svn_revision

files modified:
Changelog

Install.txt

Makefile

Release_notes.txt

create_deb.sh

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/rules

debian/changelog

debian/control

debian/copyright

debian/rules

docs/cs/faq.html

docs/en/faq.html

docs/ja/faq.html

get_svn_revision.sh

setup/smplayer.iss

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

src/eqslider.h

src/errordialog.cpp

src/errordialog.h

src/extensions.cpp

src/extensions.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/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

src/findsubtitles/findsubtitles.pro

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/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/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/inputmplayerversion.ui

src/inputurl.cpp

src/inputurl.h

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

src/playlistpreferences.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/prefinput.cpp

src/prefinput.h

src/prefinterface.cpp

src/prefinterface.h

src/prefperformance.cpp

src/prefperformance.h

src/prefplaylist.cpp

src/prefplaylist.h

src/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

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

src/smplayer.h

src/smplayer.pro

src/subtracks.cpp

src/subtracks.h

src/timedialog.cpp

src/timedialog.h

src/timedialog.ui

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_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_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_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_zh_CN.ts

src/translations/smplayer_zh_TW.ts

src/translator.cpp

src/translator.h

src/tristatecombo.cpp

src/tristatecombo.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/videopreviewconfigdialog.cpp

src/videopreview/videopreviewconfigdialog.h

src/videopreview/videopreviewconfigdialog.ui

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

Show diffs side-by-side

added added

removed removed

1

1

/* smplayer, GUI front-end for mplayer.

2

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

2

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

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

39

39

class QSettings;

40

40

41

41

#ifdef Q_OS_WIN

42

#ifdef SCREENSAVER_OFF

42

43

class WinScreenSaver;

43

44

#endif

45

#endif

44

46

45

47

class Core : public QObject

46

48

{

195

197

void incSaturation();

196

198

void decSaturation();

197

199

200

void setSubDelay(int delay);

198

201

void incSubDelay();

199

202

void decSubDelay();

200

203

204

void setAudioDelay(int delay);

201

205

void incAudioDelay();

202

206

void decAudioDelay();

203

207

339

343

void initSubtitleTrack(const SubTracks &);

340

344

void setSubtitleTrackAgain(const SubTracks &);

341

345

#endif

346

#if DVDNAV_SUPPORT

347

void dvdTitleChanged(int);

348

void durationChanged(double);

349

void askForInfo();

350

void dvdnavUpdateMousePos(QPoint);

351

#endif

342

352

343

353

protected:

344

354

void playNewFile(QString file, int seek=-1);

386

396

void needResize(int w, int h);

387

397

void noVideo();

388

398

void volumeChanged(int);

389

#if NOTIFY_SUB_CHANGES

399

#if NOTIFY_AUDIO_CHANGES

390

400

void audioTracksChanged();

391

401

#endif

392

402

415

425

#endif

416

426

417

427

#ifdef Q_OS_WIN

428

#ifdef SCREENSAVER_OFF

418

429

WinScreenSaver * win_screensaver;

419

430

#endif

431

#endif

420

432

421

433

private:

422

434

// Some variables to proper restart

Older »