diff gui/ui/render.c @ 34077:deff81b57903

Cosmetic: Order STREAMTYPE related code. Always choose order FILE, STREAM, VCD, DVD for reasons of clarity.
author ib
date Fri, 30 Sep 2011 15:28:01 +0000
parents 922771be85f6
children a345e7162d0a
line wrap: on
line diff
--- a/gui/ui/render.c	Fri Sep 30 15:13:01 2011 +0000
+++ b/gui/ui/render.c	Fri Sep 30 15:28:01 2011 +0000
@@ -47,10 +47,6 @@
     size_t len;
 
     switch (guiInfo.StreamType) {
-    case STREAMTYPE_STREAM:
-        av_strlcpy(tmp, guiInfo.Filename, tmplen);
-        break;
-
     case STREAMTYPE_FILE:
         if (guiInfo.Filename && guiInfo.Filename[0]) {
             p = strrchr(guiInfo.Filename, '/');
@@ -72,6 +68,16 @@
             av_strlcpy(tmp, MSGTR_NoFileLoaded, tmplen);
         break;
 
+    case STREAMTYPE_STREAM:
+        av_strlcpy(tmp, guiInfo.Filename, tmplen);
+        break;
+
+#ifdef CONFIG_VCD
+    case STREAMTYPE_VCD:
+        snprintf(tmp, tmplen, MSGTR_Title, guiInfo.Track - 1);
+        break;
+#endif
+
 #ifdef CONFIG_DVDREAD
     case STREAMTYPE_DVD:
         if (guiInfo.Chapter)
@@ -81,12 +87,6 @@
         break;
 #endif
 
-#ifdef CONFIG_VCD
-    case STREAMTYPE_VCD:
-        snprintf(tmp, tmplen, MSGTR_Title, guiInfo.Track - 1);
-        break;
-#endif
-
     default:
         av_strlcpy(tmp, MSGTR_NoMediaOpened, tmplen);
         break;
@@ -271,16 +271,16 @@
                     av_strlcat(trbuf, "f", sizeof(trbuf));
                     break;
 
+                case STREAMTYPE_STREAM:
+                    av_strlcat(trbuf, "u", sizeof(trbuf));
+                    break;
+
 #ifdef CONFIG_VCD
                 case STREAMTYPE_VCD:
                     av_strlcat(trbuf, "v", sizeof(trbuf));
                     break;
 #endif
 
-                case STREAMTYPE_STREAM:
-                    av_strlcat(trbuf, "u", sizeof(trbuf));
-                    break;
-
 #ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
                     av_strlcat(trbuf, "d", sizeof(trbuf));