diff options
author | Gerald Begumisa <ben_g@users.sourceforge.net> | 2007-09-08 14:46:22 +0000 |
---|---|---|
committer | Gerald Begumisa <ben_g@users.sourceforge.net> | 2007-09-08 14:46:22 +0000 |
commit | 18dd3cfeaa01293e3a575b53acc633955ce738cd (patch) | |
tree | 079d93211471489cb37fd6747cc820174c7aab26 /orkbasecxx/AudioTape.cpp | |
parent | 0d8f72030d5b7ef0462f025e401c9a480b8cf2a0 (diff) |
Added new TapeFileNaming tape processor, corrected it not to modify the MCF file
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@486 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx/AudioTape.cpp')
-rw-r--r-- | orkbasecxx/AudioTape.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/orkbasecxx/AudioTape.cpp b/orkbasecxx/AudioTape.cpp index a0d8617..09e8418 100644 --- a/orkbasecxx/AudioTape.cpp +++ b/orkbasecxx/AudioTape.cpp @@ -550,15 +550,15 @@ void AudioTape::GenerateFinalFilePath() } } - if(pathIdentifier.size() > 0) - { - m_filePath = pathIdentifier; + if(pathIdentifier.size() > 0) + { + m_filePath = pathIdentifier; - CStdString mkdirPath; + CStdString mkdirPath; - mkdirPath.Format("%s/%s", CONFIG.m_audioOutputPath, m_filePath); - FileRecursiveMkdir(mkdirPath, CONFIG.m_audioFilePermissions, CONFIG.m_audioFileOwner, CONFIG.m_audioFileGroup, CONFIG.m_audioOutputPath); - } + mkdirPath.Format("%s/%s", CONFIG.m_audioOutputPath, m_filePath); + FileRecursiveMkdir(mkdirPath, CONFIG.m_audioFilePermissions, CONFIG.m_audioFileOwner, CONFIG.m_audioFileGroup, CONFIG.m_audioOutputPath); + } } } @@ -746,9 +746,15 @@ void AudioTape::GenerateFinalFilePathAndIdentifier() { m_fileIdentifier = fileIdentifier; } + } + if(CONFIG.m_tapePathNaming.size() > 0) + { GenerateFinalFilePath(); + } + if(CONFIG.m_tapePathNaming.size() > 0 || CONFIG.m_tapeFileNaming.size() > 0) + { CStdString path = CONFIG.m_audioOutputPath + "/" + m_filePath + "/"; PreventFileIdentifierCollision(path, m_fileIdentifier , m_fileExtension); } |