summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-05-31 13:33:10 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-05-31 13:33:10 +0000
commit3228b320ac0c2c46d695a7ac2913db1ff74eb0ba (patch)
tree79e53190d8f655d34ebf8196cbf0ad15e49e8b7e /src
parent8ba939c186c723ea400b9070b2ac3d3950e549e4 (diff)
downloadxine-lib-3228b320ac0c2c46d695a7ac2913db1ff74eb0ba.tar.gz
xine-lib-3228b320ac0c2c46d695a7ac2913db1ff74eb0ba.tar.bz2
do not probe audio_none_out
CVS patchset: 4992 CVS date: 2003/05/31 13:33:10
Diffstat (limited to 'src')
-rw-r--r--src/audio_out/audio_none_out.c4
-rw-r--r--src/xine-engine/load_plugins.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c
index 014114e5e..2f93d5702 100644
--- a/src/audio_out/audio_none_out.c
+++ b/src/audio_out/audio_none_out.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: audio_none_out.c,v 1.2 2003/05/15 13:28:54 miguelfreitas Exp $
+ * $Id: audio_none_out.c,v 1.3 2003/05/31 13:33:10 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -245,7 +245,7 @@ static void *init_class (xine_t *xine, void *data) {
}
static ao_info_t ao_info_none = {
- 0
+ -1 /* do not auto probe this one */
};
/*
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index b64117f3d..1f6e6155b 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.153 2003/05/26 23:34:41 miguelfreitas Exp $
+ * $Id: load_plugins.c,v 1.154 2003/05/31 13:33:10 miguelfreitas Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -1526,7 +1526,7 @@ xine_audio_port_t *xine_open_audio_driver (xine_t *this, const char *id,
driver = _load_audio_driver (this, node, data);
break;
}
- } else {
+ } else if( ao_info->priority >= 0 ) {
driver = _load_audio_driver (this, node, data);
if (driver) {