Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3c99a3b2
Commit
3c99a3b2
authored
Mar 17, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(prev|next)-(chapter|title) is a void variable. Fix aborts.
parent
ed9fae5e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
48 deletions
+16
-48
modules/control/rc.c
modules/control/rc.c
+4
-16
modules/gui/ncurses.c
modules/gui/ncurses.c
+4
-16
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+4
-4
modules/gui/skins2/commands/cmd_dvd.cpp
modules/gui/skins2/commands/cmd_dvd.cpp
+4
-12
No files found.
modules/control/rc.c
View file @
3c99a3b2
...
...
@@ -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
;
...
...
modules/gui/ncurses.c
View file @
3c99a3b2
...
...
@@ -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'
:
...
...
modules/gui/qt4/input_manager.cpp
View file @
3c99a3b2
...
...
@@ -664,8 +664,8 @@ void InputManager::sectionPrev()
if
(
hasInput
()
)
{
int
i_type
=
var_Type
(
p_input
,
"next-chapter"
);
var_Set
Bool
(
p_input
,
(
i_type
&
VLC_VAR_TYPE
)
!=
0
?
"prev-chapter"
:
"prev-title"
,
true
);
var_Set
Void
(
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_Set
Bool
(
p_input
,
(
i_type
&
VLC_VAR_TYPE
)
!=
0
?
"next-chapter"
:
"next-title"
,
true
);
var_Set
Void
(
p_input
,
(
i_type
&
VLC_VAR_TYPE
)
!=
0
?
"next-chapter"
:
"next-title"
);
}
}
...
...
modules/gui/skins2/commands/cmd_dvd.cpp
View file @
3c99a3b2
...
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment