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
ab74d699
Commit
ab74d699
authored
Dec 04, 2012
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: adapt to latest change in playlist (activity variable)
It fixes skins2 crashing when an input is started.
parent
0f6fc6a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+11
-4
modules/gui/skins2/src/vlcproc.hpp
modules/gui/skins2/src/vlcproc.hpp
+1
-1
No files found.
modules/gui/skins2/src/vlcproc.cpp
View file @
ab74d699
...
...
@@ -367,7 +367,7 @@ int VlcProc::onGenericCallback( vlc_object_t *pObj, const char *pVariable,
} \
}
ADD_CALLBACK_ENTRY
(
"activity"
,
on_
item_current
_changed
,
false
)
ADD_CALLBACK_ENTRY
(
"activity"
,
on_
activity
_changed
,
false
)
ADD_CALLBACK_ENTRY
(
"volume"
,
on_volume_changed
,
true
)
ADD_CALLBACK_ENTRY
(
"bit-rate"
,
on_bit_rate_changed
,
false
)
...
...
@@ -444,10 +444,17 @@ int VlcProc::onGenericCallback2( vlc_object_t *pObj, const char *pVariable,
}
void
VlcProc
::
on_
item_current
_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
)
void
VlcProc
::
on_
activity
_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
)
{
(
void
)
p_obj
;
input_item_t
*
p_item
=
static_cast
<
input_item_t
*>
(
newVal
.
p_address
);
(
void
)
p_obj
;
(
void
)
newVal
;
input_thread_t
*
p_input
=
getIntf
()
->
p_sys
->
p_input
;
if
(
!
p_input
)
return
;
input_item_t
*
p_item
=
input_GetItem
(
p_input
);
if
(
!
p_item
)
return
;
// Update short name
char
*
psz_name
=
input_item_GetName
(
p_item
);
...
...
modules/gui/skins2/src/vlcproc.hpp
View file @
ab74d699
...
...
@@ -98,7 +98,7 @@ public:
/// update equalizer
void
update_equalizer
(
);
void
on_
item_current
_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
);
void
on_
activity
_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
);
void
on_intf_event_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
);
void
on_bit_rate_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
);
void
on_sample_rate_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
);
...
...
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