diff options
author | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:06:56 +0100 |
---|---|---|
committer | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:06:56 +0100 |
commit | 1d323e54ee434609cf035598486075c9a918a2d3 (patch) | |
tree | 929ad92f19dfbb5492471449f1a6a918ea99c6b8 /src/mediadata.cpp | |
parent | 99b53d44a60e3e934fc664152c115ae0d6e19920 (diff) |
Imported Upstream version 0.6.10
Diffstat (limited to 'src/mediadata.cpp')
-rw-r--r-- | src/mediadata.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mediadata.cpp b/src/mediadata.cpp index 1ce52c2..1346dad 100644 --- a/src/mediadata.cpp +++ b/src/mediadata.cpp @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org> + Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 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 @@ -88,10 +88,12 @@ void MediaData::reset() { audio_codec=""; } -QString MediaData::displayName() { - if (!clip_name.isEmpty()) return clip_name; - else - if (!stream_title.isEmpty()) return stream_title; +QString MediaData::displayName(bool show_tag) { + if (show_tag) { + if (!clip_name.isEmpty()) return clip_name; + else + if (!stream_title.isEmpty()) return stream_title; + } QFileInfo fi(filename); if (fi.exists()) |