From 59665ec0d5262cd888d21fc17575b2ef3df60509 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 11 Feb 2012 14:43:45 +0000 Subject: [PATCH 1/2] movieplayer: store last multiformat play dir git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2087 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5388f18b04d9b27d7b003a0c18f5ea0294403c81 Author: Jacek Jendrzej Date: 2012-02-11 (Sat, 11 Feb 2012) ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 284905d98..04b3d7c49 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -360,6 +360,11 @@ bool CMoviePlayerGui::SelectFile() file_name = full_name; 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()); + } + return ret; } From c80bd561bdc92519a53cb2834a2c0b89171a9714 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 15 Feb 2012 09:50:28 +0000 Subject: [PATCH 2/2] neutrino_menue.cpp: fix compile with enabled TEST_MENU git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2088 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5d4ccfcac660b42900d9a511b2d12f91cec7c20d Author: [CST] Focus Date: 2012-02-15 (Wed, 15 Feb 2012) ------------------ This commit was generated by Migit --- src/neutrino_menue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index b08ec7797..3afa108cc 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -211,7 +211,7 @@ void CNeutrinoApp::InitMenuMain() personalize.addItem(MENU_MAIN, new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler), &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); #ifdef TEST_MENU - personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu(), CPersonalizeGui::PERSONALIZE_SHOW_NO)); + personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); #endif }