From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 17 Mar 2009 16:10:29 +0000 (+0200)
Subject: (prev|next)-(chapter|title) is a void variable. Fix aborts.
X-Git-Tag: 1.0.0-pre1~34
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3c99a3b267bebe108b2380ae520cba2192bb35df;hp=ed9fae5e469fe0fcae7c1fac1ee0a31c62e968fb;p=vlc

(prev|next)-(chapter|title) is a void variable. Fix aborts.
---

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 95fd197c4f..dde5d84e89 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1157,15 +1157,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
             }
         }
         else if( !strcmp( psz_cmd, "chapter_n" ) )
-        {
-            val.b_bool = true;
-            var_Set( p_input, "next-chapter", val );
-        }
+            var_SetVoid( p_input, "next-chapter" );
         else if( !strcmp( psz_cmd, "chapter_p" ) )
-        {
-            val.b_bool = true;
-            var_Set( p_input, "prev-chapter", val );
-        }
+            var_SetVoid( p_input, "prev-chapter" );
         vlc_object_release( p_input );
         return VLC_SUCCESS;
     }
@@ -1196,15 +1190,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
             }
         }
         else if( !strcmp( psz_cmd, "title_n" ) )
-        {
-            val.b_bool = true;
-            var_Set( p_input, "next-title", val );
-        }
+            var_SetVoid( p_input, "next-title" );
         else if( !strcmp( psz_cmd, "title_p" ) )
-        {
-            val.b_bool = true;
-            var_Set( p_input, "prev-title", val );
-        }
+            var_SetVoid( p_input, "prev-title" );
 
         vlc_object_release( p_input );
         return VLC_SUCCESS;
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index e0e1820139..7d96feefa8 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1168,34 +1168,22 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
 
         case '[':
             if( p_sys->p_input )
-            {
-                val.b_bool = true;
-                var_Set( p_sys->p_input, "prev-title", val );
-            }
+                var_SetVoid( p_sys->p_input, "prev-title" );
             ReturnTrue;
 
         case ']':
             if( p_sys->p_input )
-            {
-                val.b_bool = true;
-                var_Set( p_sys->p_input, "next-title", val );
-            }
+                var_SetVoid( p_sys->p_input, "next-title" );
             ReturnTrue;
 
         case '<':
             if( p_sys->p_input )
-            {
-                val.b_bool = true;
-                var_Set( p_sys->p_input, "prev-chapter", val );
-            }
+                var_SetVoid( p_sys->p_input, "prev-chapter" );
             ReturnTrue;
 
         case '>':
             if( p_sys->p_input )
-            {
-                val.b_bool = true;
-                var_Set( p_sys->p_input, "next-chapter", val );
-            }
+                var_SetVoid( p_sys->p_input, "next-chapter" );
             ReturnTrue;
 
         case 'p':
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 312dce101a..f0b4a1c5be 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -664,8 +664,8 @@ void InputManager::sectionPrev()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
-                            "prev-chapter":"prev-title", true );
+        var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "prev-chapter":"prev-title" );
     }
 }
 
@@ -674,8 +674,8 @@ void InputManager::sectionNext()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
-                            "next-chapter":"next-title", true );
+        var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "next-chapter":"next-title" );
     }
 }
 
diff --git a/modules/gui/skins2/commands/cmd_dvd.cpp b/modules/gui/skins2/commands/cmd_dvd.cpp
index 4fe6a95d9c..232f7e5d25 100644
--- a/modules/gui/skins2/commands/cmd_dvd.cpp
+++ b/modules/gui/skins2/commands/cmd_dvd.cpp
@@ -31,9 +31,7 @@ void CmdDvdNextTitle::execute()
                                            FIND_ANYWHERE );
     if( p_input )
     {
-        vlc_value_t val;
-        val.b_bool = true;
-        var_Set( p_input, "next-title", val );
+        var_SetVoid( p_input, "next-title" );
         vlc_object_release( p_input );
     }
 }
@@ -46,9 +44,7 @@ void CmdDvdPreviousTitle::execute()
                                            FIND_ANYWHERE );
     if( p_input )
     {
-        vlc_value_t val;
-        val.b_bool = true;
-        var_Set( p_input, "prev-title", val );
+        var_SetVoid( p_input, "prev-title" );
         vlc_object_release( p_input );
     }
 }
@@ -61,9 +57,7 @@ void CmdDvdNextChapter::execute()
                                            FIND_ANYWHERE );
     if( p_input )
     {
-        vlc_value_t val;
-        val.b_bool = true;
-        var_Set( p_input, "next-chapter", val );
+        var_SetVoid( p_input, "next-chapter" );
         vlc_object_release( p_input );
     }
 }
@@ -76,9 +70,7 @@ void CmdDvdPreviousChapter::execute()
                                            FIND_ANYWHERE );
     if( p_input )
     {
-        vlc_value_t val;
-        val.b_bool = true;
-        var_Set( p_input, "prev-chapter", val );
+        var_SetVoid( p_input, "prev-chapter" );
         vlc_object_release( p_input );
     }
 }