Mercurial > mplayer.hg
comparison Gui/interface.c @ 7706:90044efe01ee
- better dxr3 support
- fix oss subdevice bug
- add some warning fix from Dominik Mierzejewski <dominik@rangers.eu.org>
author | pontscho |
---|---|
date | Thu, 10 Oct 2002 14:06:49 +0000 |
parents | 4a233f3b09a7 |
children | b3c7c62c106c |
comparison
equal
deleted
inserted
replaced
7705:844246b6c3bf | 7706:90044efe01ee |
---|---|
153 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); | 153 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); |
154 guiIntfStruct.Balance=50.0f; | 154 guiIntfStruct.Balance=50.0f; |
155 guiIntfStruct.StreamType=-1; | 155 guiIntfStruct.StreamType=-1; |
156 | 156 |
157 memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); | 157 memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); |
158 gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); | 158 if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); |
159 gtkAOOSSDevice=strdup( PATH_DEV_DSP ); | 159 if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP ); |
160 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); | |
160 fullscreen=gtkLoadFullscreen; | 161 fullscreen=gtkLoadFullscreen; |
161 | 162 |
162 gtkInit(); | 163 gtkInit(); |
163 wsXInit( (void *)mDisplay ); | 164 wsXInit( (void *)mDisplay ); |
164 | |
165 // cfg_read(); | |
166 appInit( (void*)mDisplay ); | 165 appInit( (void*)mDisplay ); |
167 | 166 |
168 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); | 167 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); |
169 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name ); | 168 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name ); |
170 #if defined( USE_OSD ) || defined( USE_SUB ) | 169 #if defined( USE_OSD ) || defined( USE_SUB ) |