new xine error (usually reported with unknown codecs)

CVS patchset: 1700
CVS date: 2002/04/09 04:35:17

3 files changed, 17 insertions, 3 deletions

diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 6a9bdbb44..f0e6f35cc 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -28,7 +28,7 @@
  \endverbatim
  */
 /*
- * $Id: xine.h.tmpl.in,v 1.90 2002/03/24 13:22:23 esnel Exp $
+ * $Id: xine.h.tmpl.in,v 1.91 2002/04/09 04:35:17 miguelfreitas Exp $
  *
  */
 
@@ -1917,6 +1917,12 @@ char **xine_get_log (xine_t *self, int buf);
  * \sa xine_get_error()
 */
 #define XINE_ERROR_NO_DEMUXER_PLUGIN 2
+/**
+ * \def XINE_ERROR_DEMUXER_FAILED
+ * Demuxer plugin failed to start.
+ * \sa xine_get_error()
+*/
+#define XINE_ERROR_DEMUXER_FAILED    3
 
              /** @} end of error_def */
 
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index f6694dcd9..b2207beca 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.c,v 1.114 2002/04/09 03:38:01 miguelfreitas Exp $
+ * $Id: xine.c,v 1.115 2002/04/09 04:35:17 miguelfreitas Exp $
  *
  * top-level xine functions
  *
@@ -402,12 +402,19 @@ int xine_play (xine_t *this, char *mrl,
 				     pos, start_time);
   
   if (this->cur_demuxer_plugin->get_status(this->cur_demuxer_plugin) != DEMUX_OK) {
+    
     xine_log (this, XINE_LOG_MSG, 
 	      _("xine_play: demuxer failed to start\n"));
     
+    this->err = XINE_ERROR_DEMUXER_FAILED;
+    
     if( this->status == XINE_STOP )      
       this->cur_input_plugin->close(this->cur_input_plugin);
   
+    pthread_mutex_unlock (&this->xine_lock);
+
+    return 0;
+    
   } else {
 
     this->status = XINE_PLAY;
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 8afb1d402..b54e4dadc 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_internal.h,v 1.75 2002/04/09 03:38:01 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.76 2002/04/09 04:35:17 miguelfreitas Exp $
  *
  */
 
@@ -609,6 +609,7 @@ int    xine_get_log_section_count (xine_t *this);
 #define XINE_ERROR_NONE              0
 #define XINE_ERROR_NO_INPUT_PLUGIN   1
 #define XINE_ERROR_NO_DEMUXER_PLUGIN 2
+#define XINE_ERROR_DEMUXER_FAILED    3
 
 int xine_get_error (xine_t *this);