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
32335766
Commit
32335766
authored
May 24, 2001
by
Stéphane Borel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-Forgot a bug for audio/spu change in the interface
parent
5e250b35
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
plugins/gtk/gnome_interface.c
plugins/gtk/gnome_interface.c
+4
-0
plugins/gtk/gtk_menu.c
plugins/gtk/gtk_menu.c
+7
-7
plugins/gtk/intf_gnome.glade
plugins/gtk/intf_gnome.glade
+4
-4
No files found.
plugins/gtk/gnome_interface.c
View file @
32335766
...
@@ -561,6 +561,7 @@ create_intf_window (void)
...
@@ -561,6 +561,7 @@ create_intf_window (void)
gtk_widget_show
(
button_title_prev
);
gtk_widget_show
(
button_title_prev
);
gtk_box_pack_start
(
GTK_BOX
(
title_chapter_box
),
button_title_prev
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
title_chapter_box
),
button_title_prev
,
FALSE
,
FALSE
,
0
);
gtk_tooltips_set_tip
(
tooltips
,
button_title_prev
,
_
(
"Select previous title"
),
NULL
);
gtk_tooltips_set_tip
(
tooltips
,
button_title_prev
,
_
(
"Select previous title"
),
NULL
);
gtk_button_set_relief
(
GTK_BUTTON
(
button_title_prev
),
GTK_RELIEF_NONE
);
button_title_next
=
gnome_stock_button
(
GNOME_STOCK_BUTTON_NEXT
);
button_title_next
=
gnome_stock_button
(
GNOME_STOCK_BUTTON_NEXT
);
gtk_widget_ref
(
button_title_next
);
gtk_widget_ref
(
button_title_next
);
...
@@ -568,6 +569,7 @@ create_intf_window (void)
...
@@ -568,6 +569,7 @@ create_intf_window (void)
(
GtkDestroyNotify
)
gtk_widget_unref
);
(
GtkDestroyNotify
)
gtk_widget_unref
);
gtk_widget_show
(
button_title_next
);
gtk_widget_show
(
button_title_next
);
gtk_box_pack_start
(
GTK_BOX
(
title_chapter_box
),
button_title_next
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
title_chapter_box
),
button_title_next
,
FALSE
,
FALSE
,
0
);
gtk_button_set_relief
(
GTK_BUTTON
(
button_title_next
),
GTK_RELIEF_NONE
);
vseparator1
=
gtk_vseparator_new
();
vseparator1
=
gtk_vseparator_new
();
gtk_widget_ref
(
vseparator1
);
gtk_widget_ref
(
vseparator1
);
...
@@ -604,6 +606,7 @@ create_intf_window (void)
...
@@ -604,6 +606,7 @@ create_intf_window (void)
gtk_widget_show
(
button_chapter_prev
);
gtk_widget_show
(
button_chapter_prev
);
gtk_box_pack_start
(
GTK_BOX
(
dvd_chapter_box
),
button_chapter_prev
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
dvd_chapter_box
),
button_chapter_prev
,
FALSE
,
FALSE
,
0
);
gtk_tooltips_set_tip
(
tooltips
,
button_chapter_prev
,
_
(
"Select previous chapter"
),
NULL
);
gtk_tooltips_set_tip
(
tooltips
,
button_chapter_prev
,
_
(
"Select previous chapter"
),
NULL
);
gtk_button_set_relief
(
GTK_BUTTON
(
button_chapter_prev
),
GTK_RELIEF_NONE
);
button_chapter_next
=
gnome_stock_button
(
GNOME_STOCK_BUTTON_NEXT
);
button_chapter_next
=
gnome_stock_button
(
GNOME_STOCK_BUTTON_NEXT
);
gtk_widget_ref
(
button_chapter_next
);
gtk_widget_ref
(
button_chapter_next
);
...
@@ -612,6 +615,7 @@ create_intf_window (void)
...
@@ -612,6 +615,7 @@ create_intf_window (void)
gtk_widget_show
(
button_chapter_next
);
gtk_widget_show
(
button_chapter_next
);
gtk_box_pack_start
(
GTK_BOX
(
dvd_chapter_box
),
button_chapter_next
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
dvd_chapter_box
),
button_chapter_next
,
FALSE
,
FALSE
,
0
);
gtk_tooltips_set_tip
(
tooltips
,
button_chapter_next
,
_
(
"Select next chapter"
),
NULL
);
gtk_tooltips_set_tip
(
tooltips
,
button_chapter_next
,
_
(
"Select next chapter"
),
NULL
);
gtk_button_set_relief
(
GTK_BUTTON
(
button_chapter_next
),
GTK_RELIEF_NONE
);
network_box
=
gtk_hbox_new
(
TRUE
,
0
);
network_box
=
gtk_hbox_new
(
TRUE
,
0
);
gtk_widget_ref
(
network_box
);
gtk_widget_ref
(
network_box
);
...
...
plugins/gtk/gtk_menu.c
View file @
32335766
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* gtk_menu.c : functions to handle menu items.
* gtk_menu.c : functions to handle menu items.
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_menu.c,v 1.
4 2001/05/23 23:08:20
stef Exp $
* $Id: gtk_menu.c,v 1.
5 2001/05/24 01:24:47
stef Exp $
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
...
@@ -84,7 +84,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
...
@@ -84,7 +84,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
* user_data to transmit intf_* and we need to refresh the other menu.
* user_data to transmit intf_* and we need to refresh the other menu.
****************************************************************************/
****************************************************************************/
#define GtkLangToggle( intf,
menu, type, callback, b_update )
\
#define GtkLangToggle( intf,
window, menu, type, callback, b_update )
\
intf_thread_t * p_intf; \
intf_thread_t * p_intf; \
GtkWidget * p_menu; \
GtkWidget * p_menu; \
es_descriptor_t * p_es; \
es_descriptor_t * p_es; \
...
@@ -94,7 +94,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
...
@@ -94,7 +94,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
if( !p_intf->p_sys->b_update ) \
if( !p_intf->p_sys->b_update ) \
{ \
{ \
p_menu = GTK_WIDGET( gtk_object_get_data( \
p_menu = GTK_WIDGET( gtk_object_get_data( \
GTK_OBJECT( p_intf->p_sys->
p_popup ), (menu) ) );
\
GTK_OBJECT( p_intf->p_sys->
window ), (menu) ) );
\
p_es = (es_descriptor_t*)user_data; \
p_es = (es_descriptor_t*)user_data; \
\
\
input_ToggleES( p_intf->p_input, p_es, menuitem->active ); \
input_ToggleES( p_intf->p_input, p_es, menuitem->active ); \
...
@@ -115,13 +115,13 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
...
@@ -115,13 +115,13 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
void
GtkMenubarAudioToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
void
GtkMenubarAudioToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
{
{
GtkLangToggle
(
"intf_window"
,
"popup_audio"
,
AUDIO_ES
,
GtkLangToggle
(
"intf_window"
,
p_popup
,
"popup_audio"
,
AUDIO_ES
,
GtkPopupAudioToggle
,
b_audio_update
);
GtkPopupAudioToggle
,
b_audio_update
);
}
}
void
GtkPopupAudioToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
void
GtkPopupAudioToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
{
{
GtkLangToggle
(
"intf_popup"
,
"menubar_audio"
,
AUDIO_ES
,
GtkLangToggle
(
"intf_popup"
,
p_window
,
"menubar_audio"
,
AUDIO_ES
,
GtkMenubarAudioToggle
,
b_audio_update
);
GtkMenubarAudioToggle
,
b_audio_update
);
}
}
...
@@ -131,13 +131,13 @@ void GtkPopupAudioToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
...
@@ -131,13 +131,13 @@ void GtkPopupAudioToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
void
GtkMenubarSubtitleToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
void
GtkMenubarSubtitleToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
{
{
GtkLangToggle
(
"intf_window"
,
"popup_subpictures"
,
SPU_ES
,
GtkLangToggle
(
"intf_window"
,
p_popup
,
"popup_subpictures"
,
SPU_ES
,
GtkPopupSubtitleToggle
,
b_spu_update
);
GtkPopupSubtitleToggle
,
b_spu_update
);
}
}
void
GtkPopupSubtitleToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
void
GtkPopupSubtitleToggle
(
GtkCheckMenuItem
*
menuitem
,
gpointer
user_data
)
{
{
GtkLangToggle
(
"intf_popup"
,
"menubar_subpictures"
,
SPU_ES
,
GtkLangToggle
(
"intf_popup"
,
p_window
,
"menubar_subpictures"
,
SPU_ES
,
GtkMenubarSubtitleToggle
,
b_spu_update
);
GtkMenubarSubtitleToggle
,
b_spu_update
);
}
}
...
...
plugins/gtk/intf_gnome.glade
View file @
32335766
...
@@ -712,7 +712,7 @@
...
@@ -712,7 +712,7 @@
<last_modification_time>
Sat, 19 May 2001 03:13:28 GMT
</last_modification_time>
<last_modification_time>
Sat, 19 May 2001 03:13:28 GMT
</last_modification_time>
</signal>
</signal>
<stock_button>
GNOME_STOCK_BUTTON_PREV
</stock_button>
<stock_button>
GNOME_STOCK_BUTTON_PREV
</stock_button>
<relief>
GTK_RELIEF_NO
RMAL
</relief>
<relief>
GTK_RELIEF_NO
NE
</relief>
<child>
<child>
<padding>
0
</padding>
<padding>
0
</padding>
<expand>
False
</expand>
<expand>
False
</expand>
...
@@ -731,7 +731,7 @@
...
@@ -731,7 +731,7 @@
<last_modification_time>
Sat, 19 May 2001 03:13:23 GMT
</last_modification_time>
<last_modification_time>
Sat, 19 May 2001 03:13:23 GMT
</last_modification_time>
</signal>
</signal>
<stock_button>
GNOME_STOCK_BUTTON_NEXT
</stock_button>
<stock_button>
GNOME_STOCK_BUTTON_NEXT
</stock_button>
<relief>
GTK_RELIEF_NO
RMAL
</relief>
<relief>
GTK_RELIEF_NO
NE
</relief>
<child>
<child>
<padding>
0
</padding>
<padding>
0
</padding>
<expand>
False
</expand>
<expand>
False
</expand>
...
@@ -806,7 +806,7 @@
...
@@ -806,7 +806,7 @@
<last_modification_time>
Sat, 19 May 2001 02:46:07 GMT
</last_modification_time>
<last_modification_time>
Sat, 19 May 2001 02:46:07 GMT
</last_modification_time>
</signal>
</signal>
<stock_button>
GNOME_STOCK_BUTTON_PREV
</stock_button>
<stock_button>
GNOME_STOCK_BUTTON_PREV
</stock_button>
<relief>
GTK_RELIEF_NO
RMAL
</relief>
<relief>
GTK_RELIEF_NO
NE
</relief>
<child>
<child>
<padding>
0
</padding>
<padding>
0
</padding>
<expand>
False
</expand>
<expand>
False
</expand>
...
@@ -826,7 +826,7 @@
...
@@ -826,7 +826,7 @@
<last_modification_time>
Sat, 19 May 2001 03:13:08 GMT
</last_modification_time>
<last_modification_time>
Sat, 19 May 2001 03:13:08 GMT
</last_modification_time>
</signal>
</signal>
<stock_button>
GNOME_STOCK_BUTTON_NEXT
</stock_button>
<stock_button>
GNOME_STOCK_BUTTON_NEXT
</stock_button>
<relief>
GTK_RELIEF_NO
RMAL
</relief>
<relief>
GTK_RELIEF_NO
NE
</relief>
<child>
<child>
<padding>
0
</padding>
<padding>
0
</padding>
<expand>
False
</expand>
<expand>
False
</expand>
...
...
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