fix manuel rec dir in timerlist

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1351 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 029f944c39
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-29 (Tue, 29 Mar 2011)

Origin message was:
------------------
-fix manuel rec dir in timerlist

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1351 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-03-29 13:01:31 +00:00
parent 5104f1403a
commit 4972263dd2
2 changed files with 33 additions and 22 deletions

View File

@@ -4079,12 +4079,13 @@ printf("radioMode: rezap %s\n", rezap ? "yes" : "no");
void CNeutrinoApp::startNextRecording()
{
if ((recordingstatus == 0) && (nextRecordingInfo != NULL)) {
bool doRecord = true;
bool doRecord = false;
if (CVCRControl::getInstance()->isDeviceRegistered()) {
recording_id = nextRecordingInfo->eventID;
if (g_settings.recording_type == RECORDING_FILE) {
char *recordingDir = strlen(nextRecordingInfo->recordingDir) > 0 ?
nextRecordingInfo->recordingDir : g_settings.network_nfs_recordingdir;
#if 0
if (!CFSMounter::isMounted(recordingDir)) {
doRecord = false;
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
@@ -4110,14 +4111,19 @@ void CNeutrinoApp::startNextRecording()
break;
}
}
if (!doRecord) {
}
#endif
if(!check_dir(recordingDir)){
doRecord = true;
}
if (!doRecord) {
// recording dir does not seem to exist in config anymore
// or an error occured while mounting
// -> try default dir
recordingDir = g_settings.network_nfs_recordingdir;
doRecord = true;
}
recordingDir = g_settings.network_nfs_recordingdir;
doRecord = true;
}
(static_cast<CVCRControl::CFileDevice*>(recordingdevice))->Directory = std::string(recordingDir);
printf("CNeutrinoApp::startNextRecording: start to dir %s\n", recordingDir);
}