Changeset 821a5903564db0029de97e113bcc67a46cc4c050

Timestamp:

04/11/08 10:41:09 (5 months ago)

Author:

Jean-Paul Saman <jean-paul.saman@m2x.nl>

git-committer:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1207903269 +0200

git-parent:

[a0f5af02411e10cd157f062bc1f44118c0d67904]

git-author:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1207903269 +0200

Message:

Sanitize STATUS_CHANGE messages.

Files:

• include/vlc_input.h (modified) (1 diff)
• modules/control/rc.c (modified) (6 diffs)

include/vlc_input.h

@@ -545 +545 @@
-};
-
+static const char *ppsz_input_state[] = { N_("Initializing"), N_("Opening"), N_("Buffer"), N_("Play"), N_("Pause"), N_("Stop"), N_("Error") }
+
-/* "rate" default, min/max
- * A rate below 1000 plays the movie faster,

modules/control/rc.c

@@ -549 +549 @@
-            {
-                p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
-0
+5
-            }
-            else if(
@@ -556 +556 @@
-            {
-                p_intf->p_sys->i_last_state = p_playlist->status.i_status;
-msg_rc( STATUS_CHANGE "( play state: 1
+ msg_rc( STATUS_CHANGE "( play state: 3
-            }
-            else if(
@@ -563 +563 @@
-            {
-                p_intf->p_sys->i_last_state = p_playlist->status.i_status;
-2
+4
-            }
-            vlc_mutex_unlock( &p_playlist->object_lock );
@@ -1000 +1000 @@
-                cmd[0] = '\0';
-            } /* var_GetInteger( p_input, "state" )  */
-
+
+
+
-            vlc_object_release( p_playlist );
-        }
@@ -1480 +1482 @@
-            {
-                case PLAYLIST_STOPPED:
-0
+5
-                    break;
-                case PLAYLIST_RUNNING:
-1
+3
-                    break;
-                case PLAYLIST_PAUSED:
-2
+4
-                    break;
-                default:
-state unknown
+unknown state: -1
-                    break;
-            }
@@ -1716 +1718 @@
-    else  if( !strcmp( psz_cmd, "snapshot" ) )
-    {
-
+
+
+
-    }
-    else