mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Lightly tested only...
This commit is contained in:
Stefan Seyfried
2013-12-25 22:51:23 +01:00
parent 164ab9ab42 bc8b81a190
commit cdd065fc2e
90 changed files with 1583 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -139,10 +139,10 @@ void CMoviePlayerGui::Init(void)
tsfilefilter.addFilter("wmv");
#endif
if (strlen(g_settings.network_nfs_moviedir) != 0)
Path_local = g_settings.network_nfs_moviedir;
else
if (g_settings.network_nfs_moviedir.empty())
Path_local = "/";
else
Path_local = g_settings.network_nfs_moviedir;
if (g_settings.filebrowser_denydirectoryleave)
filebrowser = new CFileBrowser(Path_local.c_str());
@@ -384,7 +384,7 @@ bool CMoviePlayerGui::SelectFile()
printf("CMoviePlayerGui::SelectFile: isBookmark %d timeshift %d isMovieBrowser %d\n", isBookmark, timeshift, isMovieBrowser);
if (has_hdd)
wakeup_hdd(g_settings.network_nfs_recordingdir);
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
if (timeshift) {
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
@@ -492,9 +492,7 @@ bool CMoviePlayerGui::SelectFile()
printf("CMoviePlayerGui::SelectFile: full_name [%s] file_name [%s]\n", full_name.c_str(), file_name.c_str());
}
//store last multiformat play dir
if( (sizeof(g_settings.network_nfs_moviedir)) > Path_local.size() && (strcmp(g_settings.network_nfs_moviedir,Path_local.c_str()) != 0)){
strcpy(g_settings.network_nfs_moviedir,Path_local.c_str());
}
g_settings.network_nfs_moviedir = Path_local;
return ret;
}