From 278d783cc7f9c720e85b9e8786be79122d32554a Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 19 Feb 2010 19:41:17 +0000
Subject: Remove some pointless '#if 1' preprocessor directives.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30658 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index 566f955220..29f4e42d48 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1650,7 +1650,6 @@ void reinit_audio_chain(void) {
     ao_data.samplerate=force_srate;
     ao_data.channels=0;
     ao_data.format=audio_output_format;
-#if 1
     // first init to detect best values
     if(!init_audio_filters(mpctx->sh_audio,   // preliminary init
                            // input:
@@ -1660,7 +1659,6 @@ void reinit_audio_chain(void) {
         mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
         exit_player(EXIT_ERROR);
     }
-#endif
     current_module="ao2_init";
     mpctx->audio_out = init_best_audio_out(audio_driver_list,
                                            0, // plugin flag
@@ -1682,13 +1680,11 @@ void reinit_audio_chain(void) {
     if(strlen(mpctx->audio_out->info->comment) > 0)
         mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", mpctx->audio_out->info->comment);
     // init audio filters:
-#if 1
     current_module="af_init";
     if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
         mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
         goto init_error;
     }
-#endif
     mpctx->mixer.audio_out = mpctx->audio_out;
     mpctx->mixer.volstep = volstep;
     return;
-- 
cgit v1.2.3


From 7afaac3a1ff7d8e49fc995e1d40db514017b93c7 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 19 Feb 2010 23:35:21 +0000
Subject: Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle
 mode. This makes the vos try to redraw the video if they can.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30660 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index 29f4e42d48..ca51a1a3c6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3058,6 +3058,8 @@ if(!noconsolecontrols && !slave_mode){
 while (player_idle_mode && !filename) {
     play_tree_t * entry = NULL;
     mp_cmd_t * cmd;
+    if (mpctx->video_out && vo_config_count)
+        mpctx->video_out->control(VOCTRL_PAUSE, NULL);
     while (!(cmd = mp_input_get_cmd(0,1,0))) { // wait for command
         if (mpctx->video_out && vo_config_count) mpctx->video_out->check_events();
         usec_sleep(20000);
@@ -3109,6 +3111,9 @@ while (player_idle_mode && !filename) {
 }
 //---------------------------------------------------------------------------
 
+    if (mpctx->video_out && vo_config_count)
+        mpctx->video_out->control(VOCTRL_RESUME, NULL);
+
     if(filename) {
 	mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing,
 		filename_recode(filename));
-- 
cgit v1.2.3