* ./plugins/ac3_adec/ac3_parse.c: ac3dec is now less verbose.

  * ./src/interface/interface.c: fixed a deadlock when seeking the
    stream using the keyboard arrows.

diff --git a/plugins/ac3_adec/ac3_parse.c b/plugins/ac3_adec/ac3_parse.c
index 9555fe98a9d451322435e56daff399cc44ea5f2c..e313e0a72f803af0915ce01e42eb7a0879d903ca 100644 (file)
--- a/plugins/ac3_adec/ac3_parse.c
+++ b/plugins/ac3_adec/ac3_parse.c
@@ -2,7 +2,7 @@
  * ac3_parse.c: ac3 parsing procedures
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ac3_parse.c,v 1.7 2002/02/19 00:50:19 sam Exp $
+ * $Id: ac3_parse.c,v 1.8 2002/03/06 03:27:17 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -808,6 +808,7 @@ void parse_auxdata (ac3dec_t * p_ac3dec)
 
 static void parse_bsi_stats (ac3dec_t * p_ac3dec) /* Some stats */
 {  
+#if 0
     struct mixlev_s
     {
         float clev;
@@ -848,13 +849,14 @@ static void parse_bsi_stats (ac3dec_t * p_ac3dec) /* Some stats */
     
     if ( i > 100 )
         i = 0;
+#endif
 }
 
 static void parse_audblk_stats (ac3dec_t * p_ac3dec)
 {
+#if 0
     char *exp_strat_tbl[4] = {"R   ","D15 ","D25 ","D45 "};
     u32 i;
-
     intf_ErrMsg ("(ac3dec_parseaudblk) ");
     intf_ErrMsg ("%s ",p_ac3dec->audblk.cplinu ? "cpl on" : "cpl off");
     intf_ErrMsg ("%s ",p_ac3dec->audblk.baie? "bai" : " ");
@@ -868,5 +870,6 @@ static void parse_audblk_stats (ac3dec_t * p_ac3dec)
     for(i=0;i<p_ac3dec->bsi.nfchans;i++)
             intf_ErrMsg ("%1d",p_ac3dec->audblk.blksw[i]);
     intf_ErrMsg ("]");
+#endif
 }
 

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 22d9d1fb8fd1fdc07dfb42284f7aa75e31998ccd..eaaeb92cbc0e81e897e5d1de10923932d075938c 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -4,7 +4,7 @@
  * interface, such as command line.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.90 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: interface.c,v 1.91 2002/03/06 03:27:17 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -130,7 +130,6 @@ static void intf_Manage( intf_thread_t *p_intf )
             
             if( p_input->i_status == THREAD_OVER )
             {
-                /* XXX: completely stupid ! */
                 input_DestroyThread( p_input );
                 p_input_bank->pp_input[i_input] = NULL;
                 p_input_bank->i_count--;
@@ -141,8 +140,9 @@ static void intf_Manage( intf_thread_t *p_intf )
             {
                 input_StopThread( p_input, NULL );
             }
-
         }
+
+        vlc_mutex_unlock( &p_input_bank->lock );
     }
     /* If no stream is being played, try to find one */
     else
@@ -175,9 +175,13 @@ static void intf_Manage( intf_thread_t *p_intf )
                     p_input_bank->i_count++;
                 }
             }
+
+            vlc_mutex_unlock( &p_input_bank->lock );
         }
         else
         {
+            vlc_mutex_unlock( &p_input_bank->lock );
+
             /* playing has been stopped: we no longer need outputs */
             if( p_aout_bank->i_count )
             {
@@ -194,8 +198,6 @@ static void intf_Manage( intf_thread_t *p_intf )
 
 //        vlc_mutex_unlock( &p_main->p_playlist->change_lock );
     }
-
-    vlc_mutex_unlock( &p_input_bank->lock );
 }
 
 /*****************************************************************************