comparison audio/AudioRecordTarget.cpp @ 484:01aeda073720 tony-2.0-integration

Merge from branch recording
author Chris Cannam
date Tue, 15 Sep 2015 16:38:09 +0100
parents 493f2af85497
children 21d3cf5c8f21
comparison
equal deleted inserted replaced
482:01669adb0956 484:01aeda073720
73 m_model = 0; 73 m_model = 0;
74 m_recording = false; 74 m_recording = false;
75 } 75 }
76 } 76 }
77 77
78 QString
79 AudioRecordTarget::getRecordFolder()
80 {
81 QDir parent(TempDirectory::getInstance()->getContainingPath());
82 QString subdirname = "recorded"; //!!! tr?
83 if (!parent.mkpath(subdirname)) {
84 cerr << "ERROR: AudioRecordTarget::getRecordFolder: Failed to create recorded dir in \"" << parent.canonicalPath() << "\"" << endl;
85 return "";
86 } else {
87 return parent.filePath(subdirname);
88 }
89 }
90
78 WritableWaveFileModel * 91 WritableWaveFileModel *
79 AudioRecordTarget::startRecording() 92 AudioRecordTarget::startRecording()
80 { 93 {
81 { 94 {
82 QMutexLocker locker(&m_mutex); 95 QMutexLocker locker(&m_mutex);
85 return 0; 98 return 0;
86 } 99 }
87 100
88 m_model = 0; 101 m_model = 0;
89 102
90 QDir parent(TempDirectory::getInstance()->getContainingPath()); 103 QString folder = getRecordFolder();
91 QDir recordedDir; 104 if (folder == "") return 0;
92 QString subdirname = "recorded"; //!!! tr? 105 QDir recordedDir(folder);
93 if (!parent.mkpath(subdirname)) {
94 cerr << "ERROR: AudioRecordTarget::startRecording: Failed to create recorded dir in \"" << parent.canonicalPath() << "\"" << endl;
95 return 0;
96 } else {
97 recordedDir = parent.filePath(subdirname);
98 }
99 106
100 QDateTime now = QDateTime::currentDateTime(); 107 QDateTime now = QDateTime::currentDateTime();
101 108
102 // Don't use QDateTime::toString(Qt::ISODate) as the ":" character 109 // Don't use QDateTime::toString(Qt::ISODate) as the ":" character
103 // isn't permitted in filenames on Windows 110 // isn't permitted in filenames on Windows