[vlc-commits] commit: audioscrobbler: check video-es also in playingchange ( Ilkka Ollakka )

[git at videolan.org]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat Apr  3 11:07:04 2010 +0300| [186273ab98627fdc08973340edaf5767b2aa1fb6] | committer: Ilkka Ollakka 

audioscrobbler: check video-es also in playingchange

some video seemed to go pass and sended to last.fm otherwise.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=186273ab98627fdc08973340edaf5767b2aa1fb6
---

 modules/misc/audioscrobbler.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 76d8ca6..9b18f1d 100644
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -464,6 +464,12 @@ static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
 
     if( newval.i_int != INPUT_EVENT_STATE ) return VLC_SUCCESS;
 
+    if( var_CountChoices( p_input, "video-es" ) )
+    {
+        msg_Dbg( p_this, "Not an audio-only input, not submitting");
+        return VLC_SUCCESS;
+    }
+
     state_value.i_int = 0;
 
     var_Get( p_input, "state", &state_value );
@@ -499,7 +505,6 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     intf_thread_t       *p_intf     = ( intf_thread_t* ) p_data;
     intf_sys_t          *p_sys      = p_intf->p_sys;
     input_item_t        *p_item;
-    vlc_value_t         video_val;
 
     VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
     VLC_UNUSED( oldval ); VLC_UNUSED( newval );
@@ -520,8 +525,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
         return VLC_SUCCESS;
     }
 
-    var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
-    if( video_val.i_int > 0 )
+    if( var_CountChoices( p_input, "video-es" ) )
     {
         msg_Dbg( p_this, "Not an audio-only input, not submitting");
         vlc_object_release( p_input );