* modules/access/cdda/*: forgot to remove demux in module declaration.

   fixed deadlock with CDDAFixupPlayList().

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 826ec08e31cbfac82db00af5683b9046f621c623..57f6961c94f47771fa8edd778d608164a4de578f 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: access.c,v 1.24 2004/02/11 18:08:05 gbazin Exp $
+ * $Id: access.c,v 1.25 2004/02/14 17:36:05 gbazin Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -1040,11 +1040,10 @@ E_(Open)( vlc_object_t *p_this )
 #undef area
 
     CDDAPlay( p_input, i_track);
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     CDDAFixupPlayList(p_input, p_cdda, psz_source, play_single_track);
 
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
     p_input->pf_read = CDDARead;
     p_input->pf_seek = CDDASeek;
     p_input->pf_set_area = CDDASetArea;

diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index ba59fd0d2462207b9b60db2c60bddfccc945273a..7f0dbc8cb6eba4fe7f5b490c9f7e52a4e9a9a059 100644 (file)
--- a/modules/access/cdda/cdda.c
+++ b/modules/access/cdda/cdda.c
@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: cdda.c,v 1.17 2004/01/25 18:53:06 gbazin Exp $
+ * $Id: cdda.c,v 1.18 2004/02/14 17:36:05 gbazin Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -37,8 +37,6 @@ void E_(Close)        ( vlc_object_t * );
 
 int  E_(OpenIntf)     ( vlc_object_t * );
 void E_(CloseIntf)    ( vlc_object_t * );
-int  E_(DemuxOpen)    ( vlc_object_t * p_this);
-void E_(DemuxClose)   ( vlc_object_t * p_this);
 
 int  E_(DebugCB)      ( vlc_object_t *p_this, const char *psz_name,
                         vlc_value_t oldval, vlc_value_t val,
@@ -183,10 +181,4 @@ vlc_module_begin();
 
 #endif
 
-    add_submodule();
-        set_description( _("Audio CD demux") );
-        set_capability( "demux", 0 );
-        set_callbacks( E_(DemuxOpen), E_(DemuxClose) );
-        add_shortcut( "cdda" );
-
 vlc_module_end();