* modules/control/hotkeys.c: fixed fullscreen hotkey when video filters are used.

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index d2afb43033f699749b849e2f728c9cb6e54cb997..423359bfdcea621d3009860ac64570d0a66561d3 100755 (executable)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -283,12 +283,10 @@ static void Run( intf_thread_t *p_intf )
                                  i_newvol*100/AOUT_VOLUME_MAX );
             }
         }
-        else if( i_action == ACTIONID_FULLSCREEN )
+        else if( i_action == ACTIONID_FULLSCREEN && p_vout )
         {
-            if( p_vout )
-            {
-                p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
-            }
+            var_Get( p_vout, "fullscreen", &val );
+            var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
         }
         else if( i_action == ACTIONID_PLAY )
         {
@@ -433,7 +431,7 @@ static void Run( intf_thread_t *p_intf )
                 if( p_playlist )
                 {
                     mtime_t dur =
-                        p_playlist->pp_items[p_playlist->i_index]->i_duration;
+                        p_playlist->pp_items[p_playlist->i_index]->input.i_duration;
 
                     i_seconds = time.i_time / 1000000;
                     secstotimestr ( psz_time, i_seconds );
@@ -545,7 +543,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
         char *psz_bookmark = strdup( val.psz_string );
         for( i_position = 0 ; i_position < p_playlist->i_size ; i_position++)
         {
-            if( !strcmp( psz_bookmark, p_playlist->pp_items[i_position]->psz_uri ) )
+            if( !strcmp( psz_bookmark, p_playlist->pp_items[i_position]->input.psz_uri ) )
             {
                 playlist_Goto( p_playlist, i_position );
                 break;
@@ -565,7 +563,7 @@ static void SetBookmark( intf_thread_t *p_intf, int i_num )
         char psz_bookmark_name[11];
         sprintf( psz_bookmark_name, "bookmark%i", i_num );
         var_Create( p_intf, psz_bookmark_name, VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        val.psz_string = strdup( p_playlist->pp_items[p_playlist->i_index]->psz_uri );
+        val.psz_string = strdup( p_playlist->pp_items[p_playlist->i_index]->input.psz_uri );
         var_Set( p_intf, psz_bookmark_name, val );
         msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num, val.psz_string );
         vlc_object_release( p_playlist );