Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / control / media_player.c

diff --git a/src/control/media_player.c b/src/control/media_player.c
index cf54fcd90541816804af116ba1e7de18a01ca5a8..3789ddf90a03eda5d89525329010f704a6908c77 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -34,6 +34,7 @@
 #include <vlc_demux.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
+#include <vlc_keys.h>
 
 #include "libvlc.h"
 
@@ -41,6 +42,22 @@
 #include "media_internal.h" // libvlc_media_set_state()
 #include "media_player_internal.h"
 
+/*
+ * mapping of libvlc_navigate_mode_t to vlc_key_t
+ */
+static const vlc_key_t libvlc_navigate_to_action[] =
+  {
+    ACTIONID_NAV_ACTIVATE,
+    ACTIONID_NAV_UP,
+    ACTIONID_NAV_DOWN,
+    ACTIONID_NAV_LEFT,
+    ACTIONID_NAV_RIGHT
+  };
+
+static const uint32_t libvlc_navigate_to_action_size =                 \
+  sizeof( libvlc_navigate_to_action ) / sizeof( libvlc_navigate_to_action[0] );
+
+
 static int
 input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd,
                         vlc_value_t oldval, vlc_value_t newval,
@@ -299,9 +316,15 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd,
            from_mtime(var_GetTime( p_input, "length" ));
         libvlc_event_send( p_mi->p_event_manager, &event );
     }
+    else if( newval.i_int == INPUT_EVENT_CACHE )
+    {
+        event.type = libvlc_MediaPlayerBuffering;
+        event.u.media_player_buffering.new_cache = (int)(100 *
+            var_GetFloat( p_input, "cache" ));
+        libvlc_event_send( p_mi->p_event_manager, &event );
+    }
 
     return VLC_SUCCESS;
-
 }
 
 /**************************************************************************
@@ -376,7 +399,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
     var_Create (mp, "vmem-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
     var_Create (mp, "vmem-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
     var_Create (mp, "vmem-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-    var_Create (mp, "vmem-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+    var_Create (mp, "vmem-pitch", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
     var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
 #ifdef WIN32
     var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS);
@@ -1194,6 +1217,24 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi )
     return b_seekable;
 }
 
+void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
+                                  unsigned navigate )
+{
+    input_thread_t *p_input_thread;
+
+    if ( navigate > libvlc_navigate_to_action_size)
+      return;
+
+    p_input_thread = libvlc_get_input_thread ( p_mi );
+    if ( !p_input_thread )
+      return;
+
+    var_SetInteger( p_mi->p_libvlc_instance->p_libvlc_int,
+                   "key-action", libvlc_navigate_to_action[navigate] );
+
+    vlc_object_release( p_input_thread );
+}
+
 /* internal function, used by audio, video */
 libvlc_track_description_t *
         libvlc_get_track_description( libvlc_media_player_t *p_mi,