diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-01 09:08:08 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-01 09:08:08 +0000 |
| commit | abfce41700ff052b0b17d7e6fa0a88a5ab41c815 (patch) | |
| tree | 5da888ad35a577e1a85dfee6de9b536953e46cce /Gui | |
| parent | 34512124e5a81bf82128f624faf76e1d9f448777 (diff) | |
| download | mpv-abfce41700ff052b0b17d7e6fa0a88a5ab41c815.tar.bz2 mpv-abfce41700ff052b0b17d7e6fa0a88a5ab41c815.tar.xz | |
devfs baszas
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9194 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 3db66192ca..a4466b2d56 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -1357,12 +1357,23 @@ GtkWidget * create_OSSConfig( void ) gtk_table_attach( GTK_TABLE( table2 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CBOssDevice=AddComboBox( NULL ); - gtk_table_attach( GTK_TABLE( table2 ),CBOssDevice,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); + gtk_table_attach( GTK_TABLE( table2 ),CBOssDevice,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp" ); - CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp0" ); - CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp1" ); - CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp2" ); - CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp3" ); + if ( gtkAOOSSDevice && !strncmp( gtkAOOSSDevice,"/dev/sound",10 ) ) + { + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/sound/dsp0" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/sound/dsp1" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/sound/dsp2" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/sound/dsp3" ); + } + else + { + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp0" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp1" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp2" ); + CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/dsp3" ); + } #ifdef HAVE_DXR3 CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/em8300_ma" ); CBOssDevice_items=g_list_append( CBOssDevice_items,(gpointer)"/dev/em8300_ma-0" ); |