diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-01 09:36:25 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-01 09:36:25 +0000 |
| commit | 60ee64cf192c5c8cc8896647dc03f2a87676f454 (patch) | |
| tree | c271bb9d79532b9127ce40d7d26d732aa8cd22f3 /Gui | |
| parent | abfce41700ff052b0b17d7e6fa0a88a5ab41c815 (diff) | |
| download | mpv-60ee64cf192c5c8cc8896647dc03f2a87676f454.tar.bz2 mpv-60ee64cf192c5c8cc8896647dc03f2a87676f454.tar.xz | |
again ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9195 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index a4466b2d56..60f58d4f78 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -1391,10 +1391,20 @@ GtkWidget * create_OSSConfig( void ) CBOssMixer=AddComboBox( NULL ); gtk_table_attach( GTK_TABLE( table2 ),CBOssMixer,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer" ); - CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer0" ); - CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer1" ); - CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer2" ); - CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer3" ); + if ( gtkAOOSSMixer && !strncmp( gtkAOOSSMixer,"/dev/sound",10 ) ) + { + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/sound/mixer0" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/sound/mixer1" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/sound/mixer2" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/sound/mixer3" ); + } + else + { + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer0" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer1" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer2" ); + CBOssMixer_items=g_list_append( CBOssMixer_items,(gpointer)"/dev/mixer3" ); + } gtk_combo_set_popdown_strings( GTK_COMBO( CBOssMixer ),CBOssMixer_items ); g_list_free( CBOssMixer_items ); |