summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-04-09 04:35:17 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-04-09 04:35:17 +0000
commitc838ad4cf13d8e5c884a746888299f2a5e21b13b (patch)
treea2f4c7c2c80b425bea47797afc70e9150186dc90 /src
parente9ec474224055c5801d67584c37c21f599312b60 (diff)
downloadxine-lib-c838ad4cf13d8e5c884a746888299f2a5e21b13b.tar.gz
xine-lib-c838ad4cf13d8e5c884a746888299f2a5e21b13b.tar.bz2
new xine error (usually reported with unknown codecs)
CVS patchset: 1700 CVS date: 2002/04/09 04:35:17
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/xine.c9
-rw-r--r--src/xine-engine/xine_internal.h3
2 files changed, 10 insertions, 2 deletions
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);