Changeset 165 for smplayer/trunk/src/infofile.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/infofile.cpp (modified) (3 diffs)

smplayer/trunk/src/infofile.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -49 +49 @@
                 case TYPE_TV    :       icon = "type_tv.png"; break;
                 case TYPE_STREAM :      icon = "type_url.png"; break;
+#ifdef BLURAY_SUPPORT
+                case TYPE_BLURAY :      icon = "type_bluray.png"; break;
+#endif
                 default                 :       icon = "type_unknown.png";
         }
         icon = "<img src=\"" + Images::file(icon) + "\"> ";
 
-        if (md.type == TYPE_DVD) {
+#ifdef BLURAY_SUPPORT
+        if (md.type == TYPE_DVD || md.type == TYPE_BLURAY)
+#else
+        if (md.type == TYPE_DVD)
+#endif
+        {
                 DiscData disc_data = DiscName::split(md.filename);
                 s += title( icon + disc_data.protocol + "://" + QString::number(disc_data.title) );
@@ -214 +222 @@
 
 inline QString InfoFile::tr( const char * sourceText, const char * comment, int n )  {
-        return QCoreApplication::translate("InfoFile", sourceText, comment, QCoreApplication:: CodecForTr, n );
-}
-
+#if QT_VERSION >= 0x050000
+        return QCoreApplication::translate("InfoFile", sourceText, comment, n );
+#else
+        return QCoreApplication::translate("InfoFile", sourceText, comment, QCoreApplication::CodecForTr, n );
+#endif
+}
+