Changeset 009252c45246747fe4a243f87d204a258a24a019

Timestamp:

01/10/06 16:36:15 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1159713375 +0000

git-parent:

[0326005e1cb52ee615b50c545a2e9fae858a9214]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1159713375 +0000

Message:

Some more format strings

Files:

• modules/video_filter/marq.c (modified) (4 diffs)

modules/video_filter/marq.c

@@ -91 +91 @@
-    "$d = description, $e = encoded by, $g = genre, " \
-    "$l = language, $n = track num, $p = now playing, " \
-
+
+
-    "$B = audio bitrate (in kb/s), $C = chapter," \
-    "$D = duration, $F = full name with path, $I = title, "\
-    "$L = time left, " \
-
+
+
-    "$T = time, $U = publisher, $V = volume, $_ = new line) ")
-#define POSX_TEXT N_("X offset")
@@ -342 +344 @@
-                                   p_item->p_meta->psz_rating );
-                    break;
+                case 's':
+                {
+                    char *lang;
+                    if( p_input )
+                    {
+                        lang = var_GetString( p_input, "sub-language" );
+                    }
+                    else
+                    {
+                        lang = strdup( "-" );
+                    }
+                    INSERT_STRING( 1, lang );
+                    break;
+                }
-                case 't':
-                    INSERT_STRING( p_item && p_item->p_meta,
@@ -424 +440 @@
-                    INSERT_STRING( p_item, p_item->psz_name );
-                    break;
+                case 'O':
+                {
+                    char *lang;
+                    if( p_input )
+                    {
+                        lang = var_GetString( p_input, "audio-language" );
+                    }
+                    else
+                    {
+                        lang = strdup( "-" );
+                    }
+                    INSERT_STRING( 1, lang );
+                    break;
+                }
-                case 'P':
-                    if( p_input )
@@ -433 +463 @@
-                    {
-                        sprintf( buf, "--.-%%" );
+                    }
+                    INSERT_STRING( 1, buf );
+                    break;
+                case 'R':
+                    if( p_input )
+                    {
+                        int r = var_GetInteger( p_input, "rate" );
+                        snprintf( buf, 10, "%d.%d", r/1000, r%1000 );
+                    }
+                    else
+                    {
+                        sprintf( buf, "-" );
-                    }
-                    INSERT_STRING( 1, buf );