From 96e23608dabab66c332dc3a77f8213f060b52070 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 21 Jun 2012 14:34:28 +0400 Subject: [PATCH] gui/movieplayer.cpp: add pls extension; check name from playlist Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/272e43e203236ba5be10d330ce0a756ccc5f421e Author: [CST] Focus Date: 2012-06-21 (Thu, 21 Jun 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index d69ac76f2..3c467fd18 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -117,6 +117,7 @@ void CMoviePlayerGui::Init(void) tsfilefilter.addFilter("mp4"); tsfilefilter.addFilter("mov"); tsfilefilter.addFilter("m3u"); + tsfilefilter.addFilter("pls"); if (strlen(g_settings.network_nfs_moviedir) != 0) Path_local = g_settings.network_nfs_moviedir; @@ -372,7 +373,8 @@ bool CMoviePlayerGui::SelectFile() if (url != NULL) { printf("name %s [%d] url: %s\n", name, duration, url); full_name = url; - file_name = name; + if(strlen(name)) + file_name = name; } } } @@ -423,7 +425,6 @@ void CMoviePlayerGui::PlayFile(void) duration = p_movie_info->length * 60 * 1000; file_prozent = 0; -//full_name = "http://172.16.1.1:49152/content/media/object_id/7/res_id/0/ext/file.avi"; if(!playback->Start((char *) full_name.c_str(), vpid, vtype, currentapid, currentac3, duration)) { playback->Close(); } else {