comparison mplayer.c @ 7483:44198b2f42db

removed unused old keyboard fifo hack removed unused allow_dshow hack
author arpi
date Sun, 22 Sep 2002 15:37:51 +0000
parents c4434bdf6e51
children 8dcbed9ff5db
comparison
equal deleted inserted replaced
7482:1056d2dc4f3a 7483:44198b2f42db
177 int has_video=1; 177 int has_video=1;
178 char *audio_codec=NULL; // override audio codec 178 char *audio_codec=NULL; // override audio codec
179 char *video_codec=NULL; // override video codec 179 char *video_codec=NULL; // override video codec
180 char *audio_fm=NULL; // override audio codec family 180 char *audio_fm=NULL; // override audio codec family
181 char *video_fm=NULL; // override video codec family 181 char *video_fm=NULL; // override video codec family
182
183 // IMHO this stuff is no longer of use, or is there a special
184 // reason why dshow should be completely disabled? - atmos ::
185 // yes, people without working c++ compiler can disable it - A'rpi
186 #ifdef USE_DIRECTSHOW
187 int allow_dshow=1;
188 #else
189 int allow_dshow=0;
190 #endif
191 182
192 // streaming: 183 // streaming:
193 int audio_id=-1; 184 int audio_id=-1;
194 int video_id=-1; 185 int video_id=-1;
195 int dvdsub_id=-1; 186 int dvdsub_id=-1;
1872 } 1863 }
1873 } 1864 }
1874 #endif 1865 #endif
1875 1866
1876 if(osd_function==OSD_PAUSE){ 1867 if(osd_function==OSD_PAUSE){
1877 int pkey=-1;
1878 mp_cmd_t* cmd; 1868 mp_cmd_t* cmd;
1879 if(!quiet) { 1869 if(!quiet) {
1880 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused); 1870 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
1881 fflush(stdout); 1871 fflush(stdout);
1882 } 1872 }
1889 if (audio_out && sh_audio) 1879 if (audio_out && sh_audio)
1890 audio_out->pause(); // pause audio, keep data if possible 1880 audio_out->pause(); // pause audio, keep data if possible
1891 1881
1892 while( (cmd = mp_input_get_cmd(20,1)) == NULL) { 1882 while( (cmd = mp_input_get_cmd(20,1)) == NULL) {
1893 if(sh_video && video_out && vo_config_count) video_out->check_events(); 1883 if(sh_video && video_out && vo_config_count) video_out->check_events();
1894 if((pkey=mplayer_get_key()) > 0) break;
1895 #ifdef HAVE_NEW_GUI 1884 #ifdef HAVE_NEW_GUI
1896 if(use_gui){ 1885 if(use_gui){
1897 guiEventHandling(); 1886 guiEventHandling();
1898 guiGetEvent( guiReDraw,NULL ); 1887 guiGetEvent( guiReDraw,NULL );
1899 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break; 1888 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
1913 { 1902 {
1914 if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file; 1903 if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file;
1915 guiGetEvent( guiCEvent,(char *)guiSetPlay ); 1904 guiGetEvent( guiCEvent,(char *)guiSetPlay );
1916 } 1905 }
1917 #endif 1906 #endif
1918 if(pkey!=32 && pkey!=112 && pkey!=-1)
1919 mplayer_put_key(pkey); // pass on the key
1920 } 1907 }
1921 1908
1922 // handle -sstep 1909 // handle -sstep
1923 if(step_sec>0) { 1910 if(step_sec>0) {
1924 osd_function=OSD_FFW; 1911 osd_function=OSD_FFW;