Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
c7b874c5
Commit
c7b874c5
authored
Apr 11, 2009
by
Jean-Philippe Andre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix segfault: press Shift+A without an opened AOUT would crash.
parent
d4799c27
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
modules/control/hotkeys.c
modules/control/hotkeys.c
+7
-4
No files found.
modules/control/hotkeys.c
View file @
c7b874c5
...
@@ -162,6 +162,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -162,6 +162,7 @@ static void Close( vlc_object_t *p_this )
static
void
Run
(
intf_thread_t
*
p_intf
)
static
void
Run
(
intf_thread_t
*
p_intf
)
{
{
vout_thread_t
*
p_vout
=
NULL
;
vout_thread_t
*
p_vout
=
NULL
;
aout_instance_t
*
p_aout
=
NULL
;
vlc_value_t
val
;
vlc_value_t
val
;
playlist_t
*
p_playlist
=
pl_Hold
(
p_intf
);
playlist_t
*
p_playlist
=
pl_Hold
(
p_intf
);
int
canc
=
vlc_savecancel
();
int
canc
=
vlc_savecancel
();
...
@@ -194,6 +195,9 @@ static void Run( intf_thread_t *p_intf )
...
@@ -194,6 +195,9 @@ static void Run( intf_thread_t *p_intf )
p_last_vout
=
p_vout
;
p_last_vout
=
p_vout
;
p_vout
=
p_input
?
input_GetVout
(
p_input
)
:
NULL
;
p_vout
=
p_input
?
input_GetVout
(
p_input
)
:
NULL
;
/* Update the aout */
p_aout
=
p_input
?
input_GetAout
(
p_input
)
:
NULL
;
/* Register OSD channels */
/* Register OSD channels */
if
(
p_vout
&&
p_vout
!=
p_last_vout
)
if
(
p_vout
&&
p_vout
!=
p_last_vout
)
{
{
...
@@ -371,13 +375,11 @@ static void Run( intf_thread_t *p_intf )
...
@@ -371,13 +375,11 @@ static void Run( intf_thread_t *p_intf )
playlist_Play
(
p_playlist
);
playlist_Play
(
p_playlist
);
}
}
}
}
else
if
(
i_action
==
ACTIONID_AUDIODEVICE_CYCLE
)
else
if
(
(
i_action
==
ACTIONID_AUDIODEVICE_CYCLE
)
&&
p_aout
)
{
{
vlc_value_t
val
,
list
,
list2
;
vlc_value_t
val
,
list
,
list2
;
int
i_count
,
i
;
int
i_count
,
i
;
aout_instance_t
*
p_aout
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_AOUT
,
FIND_ANYWHERE
);
var_Get
(
p_aout
,
"audio-device"
,
&
val
);
var_Get
(
p_aout
,
"audio-device"
,
&
val
);
var_Change
(
p_aout
,
"audio-device"
,
VLC_VAR_GETCHOICES
,
var_Change
(
p_aout
,
"audio-device"
,
VLC_VAR_GETCHOICES
,
&
list
,
&
list2
);
&
list
,
&
list2
);
...
@@ -417,7 +419,6 @@ static void Run( intf_thread_t *p_intf )
...
@@ -417,7 +419,6 @@ static void Run( intf_thread_t *p_intf )
vout_OSDMessage
(
p_intf
,
DEFAULT_CHAN
,
vout_OSDMessage
(
p_intf
,
DEFAULT_CHAN
,
_
(
"Audio Device: %s"
),
_
(
"Audio Device: %s"
),
list2
.
p_list
->
p_values
[
i
].
psz_string
);
list2
.
p_list
->
p_values
[
i
].
psz_string
);
vlc_object_release
(
p_aout
);
}
}
/* Input options */
/* Input options */
else
if
(
p_input
)
else
if
(
p_input
)
...
@@ -912,6 +913,8 @@ static void Run( intf_thread_t *p_intf )
...
@@ -912,6 +913,8 @@ static void Run( intf_thread_t *p_intf )
}
}
}
}
}
}
if
(
p_aout
)
vlc_object_release
(
p_aout
);
if
(
p_vout
)
if
(
p_vout
)
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
if
(
p_input
)
if
(
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