From fbef338a1dccaef1909719c9db7c3c3db9bfc8e1 Mon Sep 17 00:00:00 2001 From: satbaby Date: Tue, 20 Mar 2012 18:20:16 +0000 Subject: [PATCH 1/2] prio for user keys git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2156 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/movieplayer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 871d1188d..7b7af2963 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -560,11 +560,6 @@ void CMoviePlayerGui::PlayFile(void) playback->SetPosition(-10 * 1000); } else if (msg == CRCInput::RC_0) { // cancel bookmark jump handleMovieBrowser(CRCInput::RC_0, position); - } - else if (msg == CRCInput::RC_timeout) { - // nothing - } else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { - //FIXME do nothing ? } else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) { callInfoViewer(duration, position); update_lcd = true; @@ -624,6 +619,10 @@ void CMoviePlayerGui::PlayFile(void) printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n"); playstate = CMoviePlayerGui::STOPPED; g_RCInput->postMsg(msg, data); + } else if (msg == CRCInput::RC_timeout) { + // nothing + } else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + //FIXME do nothing ? } else { if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all) { printf("CMoviePlayerGui::PlayFile: neutrino handleMsg messages_return::cancel_all\n"); From ac7b77df507110ad2ad7d65439970fa7a2b003b4 Mon Sep 17 00:00:00 2001 From: satbaby Date: Wed, 21 Mar 2012 13:40:37 +0000 Subject: [PATCH 2/2] delete with system(rm) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2157 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/record.cpp | 2 +- src/gui/moviebrowser.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index d99baa94b..aa7da3d1a 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -226,7 +226,7 @@ bool CRecordInstance::Stop(bool remove_event) CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD); if((autoshift && g_settings.auto_delete) /* || autoshift_delete*/) { - snprintf(buf,sizeof(buf), "rm -f %s.ts &", filename); + snprintf(buf,sizeof(buf), "nice -n 20 rm -f %s.ts &", filename); system(buf); snprintf(buf,sizeof(buf), "%s.xml", filename); //autoshift_delete = false; diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 8c523d21c..1643869ee 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -2572,7 +2572,9 @@ bool CMovieBrowser::delFile_vlc(CFile& /*file*/) bool CMovieBrowser::delFile_std(CFile& file) { bool result = true; - unlink(file.Name.c_str()); // fix: use full path + char buf[FILENAME_MAX]={0}; + snprintf(buf,sizeof(buf), "nice -n 20 rm -f %s &", file.Name.c_str()); + system(buf); TRACE(" delete file: %s\r\n",file.Name.c_str()); return(result); }