mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multituner

Browse Source
This commit is contained in:
[CST] Focus
2012-03-22 19:14:27 +04:00
parent d39b174c75 ac7b77df50
commit c43b9b6996
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/record.cpp
View File

@@ -232,7 +232,7 @@ bool CRecordInstance::Stop(bool remove_event)
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD); CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if((autoshift && g_settings.auto_delete) /* || autoshift_delete*/) { 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); system(buf);
snprintf(buf,sizeof(buf), "%s.xml", filename); snprintf(buf,sizeof(buf), "%s.xml", filename);
//autoshift_delete = false; //autoshift_delete = false;

4
src/gui/moviebrowser.cpp
View File

@@ -2572,7 +2572,9 @@ bool CMovieBrowser::delFile_vlc(CFile& /*file*/)
bool CMovieBrowser::delFile_std(CFile& file) bool CMovieBrowser::delFile_std(CFile& file)
{ {
bool result = true; 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()); TRACE(" delete file: %s\r\n",file.Name.c_str());
return(result); return(result);
} }

9
src/gui/movieplayer.cpp
View File

@@ -560,11 +560,6 @@ void CMoviePlayerGui::PlayFile(void)
playback->SetPosition(-10 * 1000); playback->SetPosition(-10 * 1000);
} else if (msg == CRCInput::RC_0) { // cancel bookmark jump } else if (msg == CRCInput::RC_0) { // cancel bookmark jump
handleMovieBrowser(CRCInput::RC_0, position); 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) { } else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
callInfoViewer(duration, position); callInfoViewer(duration, position);
update_lcd = true; update_lcd = true;
@@ -624,6 +619,10 @@ void CMoviePlayerGui::PlayFile(void)
printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n"); printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n");
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
g_RCInput->postMsg(msg, data); 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 { } else {
if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all) { if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all) {
printf("CMoviePlayerGui::PlayFile: neutrino handleMsg messages_return::cancel_all\n"); printf("CMoviePlayerGui::PlayFile: neutrino handleMsg messages_return::cancel_all\n");