mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp: add pls extension; check name from playlist

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 272e43e203
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-06-21 14:34:28 +04:00
parent be3e150786
commit 96e23608da
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/movieplayer.cpp
View File

@@ -117,6 +117,7 @@ void CMoviePlayerGui::Init(void)
tsfilefilter.addFilter("mp4"); tsfilefilter.addFilter("mp4");
tsfilefilter.addFilter("mov"); tsfilefilter.addFilter("mov");
tsfilefilter.addFilter("m3u"); tsfilefilter.addFilter("m3u");
tsfilefilter.addFilter("pls");
if (strlen(g_settings.network_nfs_moviedir) != 0) if (strlen(g_settings.network_nfs_moviedir) != 0)
Path_local = g_settings.network_nfs_moviedir; Path_local = g_settings.network_nfs_moviedir;
@@ -372,7 +373,8 @@ bool CMoviePlayerGui::SelectFile()
if (url != NULL) { if (url != NULL) {
printf("name %s [%d] url: %s\n", name, duration, url); printf("name %s [%d] url: %s\n", name, duration, url);
full_name = 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; duration = p_movie_info->length * 60 * 1000;
file_prozent = 0; 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)) { if(!playback->Start((char *) full_name.c_str(), vpid, vtype, currentapid, currentac3, duration)) {
playback->Close(); playback->Close();
} else { } else {