modules/control/http: Fix input_item memleak.

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 6f62227546aec161a47adaa3d1ed35b3aac15e43..f62a3f4084bb327762c0dddcfc648982b77bf0b4 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -25,7 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
@@ -155,35 +154,58 @@ static void Run( intf_thread_t *p_intf )
         var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
     }
 
-    while( !intf_ShouldDie( p_intf ) )
+    for( vlc_bool_t b_quit = VLC_FALSE ; !b_quit; )
     {
         int i_key, i_action;
         int i_times = 0;
 
         /* Sleep a bit */
-//        msleep( INTF_IDLE_SLEEP );
+        /* msleep( INTF_IDLE_SLEEP ); */
 
-        /* Find action triggered by hotkey */
         i_action = 0;
         i_key = GetKey( p_intf );
-        for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
+
+        /* Special action for mouse event */
+        /* FIXME: This should probably be configurable */
+        /* FIXME: rework hotkeys handling to allow more than 1 event
+         * to trigger one same action */
+        switch (i_key & KEY_SPECIAL)
         {
-            if( p_hotkeys[i].i_key == i_key )
+            case KEY_MOUSEWHEELUP:
+                i_action = ACTIONID_VOL_UP;
+                break;
+            case KEY_MOUSEWHEELDOWN:
+                i_action = ACTIONID_VOL_DOWN;
+                break;
+            case KEY_MOUSEWHEELLEFT:
+                i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT;
+                break;
+            case KEY_MOUSEWHEELRIGHT:
+                i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT;
+                break;
+            default: break;
+        }
+
+        /* No mouse action, find action triggered by hotkey */
+        if(!i_action)
+        {
+            for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
             {
-                i_action = p_hotkeys[i].i_action;
-                i_times  = p_hotkeys[i].i_times;
-                /* times key pressed within max. delta time */
-                p_hotkeys[i].i_times = 0;
+                if( p_hotkeys[i].i_key == i_key )
+                {
+                    i_action = p_hotkeys[i].i_action;
+                    i_times  = p_hotkeys[i].i_times;
+                    /* times key pressed within max. delta time */
+                    p_hotkeys[i].i_times = 0;
+                    break;
+                }
             }
         }
 
         if( !i_action )
         {
-            vlc_mutex_lock( &p_intf->object_lock );
-            vlc_cond_wait( &p_intf->object_wait, &p_intf->object_lock );
-            vlc_mutex_unlock( &p_intf->object_lock );
+            b_quit = vlc_object_lock_and_wait( p_intf );
             /* No key pressed, sleep a bit more */
-//            msleep( INTF_IDLE_SLEEP );
             continue;
         }
 
@@ -193,7 +215,7 @@ static void Run( intf_thread_t *p_intf )
         if( p_input )
             vlc_object_yield( p_input );
         PL_UNLOCK;
-        
+
         /* Update the vout */
         p_last_vout = p_vout;
         p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
@@ -210,7 +232,10 @@ static void Run( intf_thread_t *p_intf )
 
         if( i_action == ACTIONID_QUIT )
         {
-            p_intf->p_libvlc->b_die = VLC_TRUE;
+            if( p_playlist )
+                playlist_Stop( p_playlist );
+            vlc_object_kill( p_intf->p_libvlc );
+            vlc_object_kill( p_intf );
             ClearChannels( p_intf, p_vout );
             vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
             if( p_vout )
@@ -257,7 +282,7 @@ static void Run( intf_thread_t *p_intf )
         {
             if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
         }
-        else if( i_action == ACTIONID_FULLSCREEN )
+        else if( i_action == ACTIONID_TOGGLE_FULLSCREEN )
         {
             if( p_vout )
             {
@@ -272,6 +297,28 @@ static void Run( intf_thread_t *p_intf )
                 var_Set( p_playlist, "fullscreen", val );
             }
         }
+        else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
+        {
+            if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
+            {
+                var_SetBool( p_vout, "fullscreen", VLC_FALSE );
+            }
+        }
+        else if( i_action == ACTIONID_WALLPAPER )
+        {
+            if( p_vout )
+            {
+                var_Get( p_vout, "directx-wallpaper", &val );
+                val.b_bool = !val.b_bool;
+                var_Set( p_vout, "directx-wallpaper", val );
+            }
+            else
+            {
+                var_Get( p_playlist, "directx-wallpaper", &val );
+                val.b_bool = !val.b_bool;
+                var_Set( p_playlist, "directx-wallpaper", val );
+            }
+        }
         else if( i_action == ACTIONID_LOOP )
         {
             /* Toggle Normal -> Loop -> Repeat -> Normal ... */
@@ -712,6 +759,34 @@ static void Run( intf_thread_t *p_intf )
                     playlist_Play( p_playlist );
                 }
             }
+            else if( i_action == ACTIONID_MENU_ON )
+            {
+                osd_MenuShow( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_OFF )
+            {
+                osd_MenuHide( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_LEFT )
+            {
+                osd_MenuPrev( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_RIGHT )
+            {
+                osd_MenuNext( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_UP )
+            {
+                osd_MenuUp( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_DOWN )
+            {
+                osd_MenuDown( VLC_OBJECT(p_intf) );
+            }
+            else if( i_action == ACTIONID_MENU_SELECT )
+            {
+                osd_MenuActivate( VLC_OBJECT(p_intf) );
+            }
         }
         if( p_vout )
             vlc_object_release( p_vout );
@@ -815,12 +890,16 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
     char *psz_bookmark = strdup( val.psz_string );
     PL_LOCK;
     FOREACH_ARRAY( playlist_item_t *p_item, p_playlist->items )
-        if( !strcmp( psz_bookmark, p_item->p_input->psz_uri ) )
+        char *psz_uri = input_item_GetURI( p_item->p_input );
+        if( !strcmp( psz_bookmark, psz_uri ) )
         {
+            free( psz_uri );
             playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
                               NULL, p_item );
             break;
         }
+        else
+            free( psz_uri );
     FOREACH_END();
     PL_UNLOCK;
     vlc_object_release( p_playlist );
@@ -835,10 +914,10 @@ static void SetBookmark( intf_thread_t *p_intf, int i_num )
                 VLC_VAR_STRING|VLC_VAR_DOINHERIT );
     if( p_playlist->status.p_item )
     {
-        config_PutPsz( p_intf, psz_bookmark_name,
-                       p_playlist->status.p_item->p_input->psz_uri);
-        msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
-                  p_playlist->status.p_item->p_input->psz_uri);
+        char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
+        config_PutPsz( p_intf, psz_bookmark_name, psz_uri);
+        msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num, psz_uri);
+        free( psz_uri );
         config_SaveConfigFile( p_intf, "hotkeys" );
     }
     pl_Release( p_intf );