~ubuntu-branches/debian/squeeze/smplayer/squeeze

« back to all changes in this revision

Viewing changes to src/mediadata.cpp

Committer: Bazaar Package Importer
Author(s): Breuil Cyril
Date: 2007-06-24 16:35:29 UTC
mfrom: (1.1.1 upstream)
Revision ID: james.westby@ubuntu.com-20070624163529-hhckbmd24uicada7

Tags: 0.5.20-0ubuntu1

* New upstream release
* Change Maintainer Email

files added:
Configurable_shortcuts.txt

FAQ.txt

Icon_themes.txt

Install.txt

Readme.txt

Release_notes.txt

debian-rvm

debian-rvm/README

debian-rvm/README.Debian

debian-rvm/changelog

debian-rvm/compat

debian-rvm/control

debian-rvm/copyright

debian-rvm/cron.d.ex

debian-rvm/dirs

debian-rvm/docs

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/menu

debian-rvm/postinst.ex

debian-rvm/postrm.ex

debian-rvm/preinst.ex

debian-rvm/prerm.ex

debian-rvm/rules

debian-rvm/smplayer-default.ex

debian-rvm/smplayer.doc-base.EX

debian-rvm/watch.ex

src/icons-png/cdda.png

src/icons-png/gamma.png

src/icons-png/xtype_cdda.png

src/keychooser.cpp

src/keychooser.h

src/mysystemtrayicon.cpp

src/mysystemtrayicon.h

src/mytable.cpp

src/mytable.h

src/playlist.cpp

src/playlist.h

src/translations

src/translations/smplayer_bg.qm

src/translations/smplayer_bg.ts

src/translations/smplayer_cs.qm

src/translations/smplayer_cs.ts

src/translations/smplayer_de.qm

src/translations/smplayer_de.ts

src/translations/smplayer_en_US.qm

src/translations/smplayer_en_US.ts

src/translations/smplayer_es.qm

src/translations/smplayer_es.ts

src/translations/smplayer_fr.qm

src/translations/smplayer_fr.ts

src/translations/smplayer_hu.qm

src/translations/smplayer_hu.ts

src/translations/smplayer_it.qm

src/translations/smplayer_it.ts

src/translations/smplayer_ja.qm

src/translations/smplayer_ja.ts

src/translations/smplayer_ka.qm

src/translations/smplayer_ka.ts

src/translations/smplayer_nl.qm

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.qm

src/translations/smplayer_pl.ts

src/translations/smplayer_pt_BR.qm

src/translations/smplayer_pt_BR.ts

src/translations/smplayer_pt_PT.qm

src/translations/smplayer_pt_PT.ts

src/translations/smplayer_ro_RO.qm

src/translations/smplayer_ro_RO.ts

src/translations/smplayer_ru_RU.qm

src/translations/smplayer_ru_RU.ts

src/translations/smplayer_sk.qm

src/translations/smplayer_sk.ts

src/translations/smplayer_sr.qm

src/translations/smplayer_sr.ts

src/translations/smplayer_sv.qm

src/translations/smplayer_sv.ts

src/translations/smplayer_tr.qm

src/translations/smplayer_tr.ts

src/translations/smplayer_uk_UA.qm

src/translations/smplayer_uk_UA.ts

src/translations/smplayer_zh_CN.qm

src/translations/smplayer_zh_CN.ts

src/translations/smplayer_zh_TW.qm

src/translations/smplayer_zh_TW.ts

files removed:
Iconsets.txt

README.txt

src/playlist2.cpp

src/playlist2.h

src/smplayer_bg.qm

src/smplayer_bg.ts

src/smplayer_cs.qm

src/smplayer_cs.ts

src/smplayer_de.qm

src/smplayer_de.ts

src/smplayer_en_US.qm

src/smplayer_en_US.ts

src/smplayer_es.qm

src/smplayer_es.ts

src/smplayer_fr.qm

src/smplayer_fr.ts

src/smplayer_hu.qm

src/smplayer_hu.ts

src/smplayer_it.qm

src/smplayer_it.ts

src/smplayer_ja.qm

src/smplayer_ja.ts

src/smplayer_ka.qm

src/smplayer_ka.ts

src/smplayer_nl.qm

src/smplayer_nl.ts

src/smplayer_pl.qm

src/smplayer_pl.ts

src/smplayer_pt_BR.qm

src/smplayer_pt_BR.ts

src/smplayer_ru_RU.qm

src/smplayer_ru_RU.ts

src/smplayer_sk.qm

src/smplayer_sk.ts

src/smplayer_uk_UA.qm

src/smplayer_uk_UA.ts

src/smplayer_zh_CN.qm

src/smplayer_zh_CN.ts

files modified:
Changelog

Copying.txt

Makefile

Not_so_obvious_things.txt

Translations.txt

debian/changelog

debian/control

debian/docs

debian/rules

smplayer.spec

src/Makefile

src/aboutdialog.cpp

src/actionseditor.cpp

src/actionseditor.h

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/baseguiplus.h

src/client.cpp

src/config.h

src/constants.h

src/core.cpp

src/core.h

src/csmanager.cpp

src/csmanager.h

src/defaultgui.cpp

src/defaultgui.h

src/desktopinfo.cpp

src/desktopinfo.h

src/floatingcontrol.cpp

src/floatingcontrol.h

src/global.cpp

src/global.h

src/helper.cpp

src/helper.h

src/images.cpp

src/infofile.cpp

src/inforeader.cpp

src/main.cpp

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/myaction.cpp

src/preferences.cpp

src/preferences.h

src/preferencesdialog.cpp

src/preferencesdialog.h

src/preferencesdialogbase.ui

src/qt3_4_compat.h

src/seekwidget.cpp

src/seekwidgetbase.ui

src/server.cpp

src/server.h

src/shortcuts/default.keys

src/smplayer.pro

src/timeslider.cpp

src/version.h

Show diffs side-by-side

added added

removed removed

src/mediadata.cpp

clip_comment = "";

clip_software = "";

stream_title = "";

stream_url = "";

// Other data

demuxer="";

video_format="";

}

QString MediaData::displayName() {

if (!clip_name.isEmpty()) return clip_name;

else

if (!stream_title.isEmpty()) return stream_title;

QFileInfo fi(filename);

if (fi.exists())

100

return fi.fileName(); // filename without path

Older »