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
41ba5dad
Commit
41ba5dad
authored
Oct 15, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Message deactivation in Interface due to new API. Not functionnal change but compiles.
parent
4396baf0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
modules/gui/ncurses.c
modules/gui/ncurses.c
+6
-2
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+4
-0
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+14
-0
No files found.
modules/gui/ncurses.c
View file @
41ba5dad
...
...
@@ -260,7 +260,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
b_box_cleared
=
false
;
p_sys
->
i_box_plidx
=
0
;
p_sys
->
i_box_bidx
=
0
;
p_sys
->
p_sub
=
msg_Subscribe
(
p_intf
);
// FIXME
p_sys->p_sub = msg_Subscribe( p_intf );
p_sys
->
b_color
=
var_CreateGetBool
(
p_intf
,
"color"
);
p_sys
->
b_color_started
=
false
;
...
...
@@ -368,7 +368,7 @@ static void Close( vlc_object_t *p_this )
/* Close the ncurses interface */
endwin
();
msg_Unsubscribe
(
p_intf
,
p_sys
->
p_sub
);
// FIXME
msg_Unsubscribe( p_intf, p_sys->p_sub );
/* Restores initial verbose setting */
vlc_value_t
val
;
...
...
@@ -1885,12 +1885,15 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
}
else
if
(
p_sys
->
i_box_type
==
BOX_LOG
)
{
#warning Deprecated API
#if 0
int i_line = 0;
int i_stop;
int i_start;
DrawBox( p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color );
i_start = p_intf->p_sys->p_sub->i_start;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
...
...
@@ -1926,6 +1929,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
p_intf->p_sys->p_sub->i_start = i_stop;
vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
y = y_end;
#endif
}
else
if
(
p_sys
->
i_box_type
==
BOX_BROWSE
)
{
...
...
modules/gui/qt4/qt4.cpp
View file @
41ba5dad
...
...
@@ -264,7 +264,11 @@ static int Open( vlc_object_t *p_this )
/* Access to the playlist */
p_intf
->
p_sys
->
p_playlist
=
pl_Hold
(
p_intf
);
/* Listen to the messages */
<<<<<<<
Updated
upstream
:
modules
/
gui
/
qt4
/
qt4
.
cpp
//p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL );
=======
//p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
>>>>>>>
Stashed
changes
:
modules
/
gui
/
qt4
/
qt4
.
cpp
/* one settings to rule them all */
var_Create
(
p_this
,
"window_widget"
,
VLC_VAR_ADDRESS
);
...
...
modules/gui/skins2/src/skin_main.cpp
View file @
41ba5dad
...
...
@@ -96,7 +96,9 @@ static int Open( vlc_object_t *p_this )
p_intf
->
pf_run
=
Run
;
// Suscribe to messages bank
#if 0
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
#endif
p_intf
->
p_sys
->
p_input
=
NULL
;
p_intf
->
p_sys
->
p_playlist
=
pl_Hold
(
p_intf
);
...
...
@@ -123,35 +125,45 @@ static int Open( vlc_object_t *p_this )
{
msg_Err
(
p_intf
,
"cannot initialize OSFactory"
);
vlc_object_release
(
p_intf
->
p_sys
->
p_playlist
);
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
return
VLC_EGENERIC
;
}
if
(
AsyncQueue
::
instance
(
p_intf
)
==
NULL
)
{
msg_Err
(
p_intf
,
"cannot initialize AsyncQueue"
);
vlc_object_release
(
p_intf
->
p_sys
->
p_playlist
);
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
return
VLC_EGENERIC
;
}
if
(
Interpreter
::
instance
(
p_intf
)
==
NULL
)
{
msg_Err
(
p_intf
,
"cannot instanciate Interpreter"
);
vlc_object_release
(
p_intf
->
p_sys
->
p_playlist
);
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
return
VLC_EGENERIC
;
}
if
(
VarManager
::
instance
(
p_intf
)
==
NULL
)
{
msg_Err
(
p_intf
,
"cannot instanciate VarManager"
);
vlc_object_release
(
p_intf
->
p_sys
->
p_playlist
);
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
return
VLC_EGENERIC
;
}
if
(
VlcProc
::
instance
(
p_intf
)
==
NULL
)
{
msg_Err
(
p_intf
,
"cannot initialize VLCProc"
);
vlc_object_release
(
p_intf
->
p_sys
->
p_playlist
);
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
return
VLC_EGENERIC
;
}
Dialogs
::
instance
(
p_intf
);
...
...
@@ -187,7 +199,9 @@ static void Close( vlc_object_t *p_this )
}
// Unsubscribe from messages bank
#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
#endif
// Destroy structure
free
(
p_intf
->
p_sys
);
...
...
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