aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/python/Plugins/Extensions/MediaPlayer/plugin.py2
-rw-r--r--lib/service/servicemp3.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 2ebcb615..27b47768 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -820,7 +820,7 @@ def filescan(**kwargs):
)]
try:
from Plugins.Extensions.CDInfo.plugin import Query
- mediatypes.append(Scanner(mimetypes = ["audio/x-cda", "audio/x-wav"],
+ mediatypes.insert(0,Scanner(mimetypes = ["audio/x-cda", "audio/x-wav"],
paths_to_scan =
[
ScanPath(path = "", with_subdirs = False),
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index fb767281..aef4f5e2 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -140,7 +140,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
int is_mp3 = !strcasecmp(ext, ".mp3"); /* force mp3 instead of decodebin */
int is_video = is_mpeg_ps || is_mpeg_ts || is_matroska || is_avi;
int is_streaming = !strncmp(filename, "http://", 7);
- int is_AudioCD = !(strncmp(filename, "/autofs/hda/track-", 18) || strcasecmp(ext, ".wav"));
+ int is_AudioCD = !(strncmp(filename, "/autofs/", 8) || strncmp(filename+strlen(filename)-13, "/track-", 7) || strcasecmp(ext, ".wav"));
eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d, is_matroska: %d, is_avi: %d, is_AudioCD: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi, is_AudioCD);