summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-11 20:09:04 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-11 20:09:04 +0100
commitf77028285a231edada74b0d93e4198fa8179880e (patch)
tree5f860d5da9bfee41f31141703d63c237f195bf65 /src/combined
parent431e07e0b69bd75ff85ba0c2e1b1e08313e746be (diff)
downloadxine-lib-f77028285a231edada74b0d93e4198fa8179880e.tar.gz
xine-lib-f77028285a231edada74b0d93e4198fa8179880e.tar.bz2
Rename METHOD_BY_EXTENSION to METHOD_BY_MRL, as it's used to identify protocols too.
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/flac_demuxer.c2
-rw-r--r--src/combined/nsf_demuxer.c2
-rw-r--r--src/combined/wavpack_demuxer.c2
-rw-r--r--src/combined/xine_ogg_demuxer.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index a8a01f7d4..bee98d2a3 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -580,7 +580,7 @@ open_plugin (demux_class_t *class_gen,
return NULL;
}
break;
- case METHOD_BY_EXTENSION:
+ case METHOD_BY_MRL:
case METHOD_EXPLICIT:
break;
default:
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 898d00f3e..cce7c8983 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -318,7 +318,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
switch (stream->content_detection_method) {
- case METHOD_BY_EXTENSION:
+ case METHOD_BY_MRL:
case METHOD_BY_CONTENT:
case METHOD_EXPLICIT:
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 850a58be7..ac5c66a8d 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -349,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
this->status = DEMUX_FINISHED;
switch (stream->content_detection_method) {
- case METHOD_BY_EXTENSION:
+ case METHOD_BY_MRL:
case METHOD_BY_CONTENT:
case METHOD_EXPLICIT:
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index f5df0401d..70cfc5846 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -1943,7 +1943,7 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen,
return 0;
}
- case METHOD_BY_EXTENSION:
+ case METHOD_BY_MRL:
case METHOD_EXPLICIT:
return 1;
@@ -1994,7 +1994,7 @@ static int detect_anx_content (int detection_method, demux_class_t *class_gen,
#undef ANNODEX_SIGNATURE_SEARCH
- case METHOD_BY_EXTENSION:
+ case METHOD_BY_MRL:
case METHOD_EXPLICIT:
return 1;