summaryrefslogtreecommitdiffstats
path: root/src/recording
diff options
context:
space:
mode:
authorjosepma <josepma@gmail.com>2016-10-31 23:54:26 +0100
committerjosepma <josepma@gmail.com>2016-10-31 23:54:26 +0100
commit5bbe8fef234900c3f6cfa14f7d38932a09fbba02 (patch)
treea3a807c541a4a82e13e3619eae83a0a3a4f860f5 /src/recording
parentb33faf24114b13703a67add3eeaa9a9358cc61e0 (diff)
fixes bugs #1638115 and#1605922 related to recording and splitting
Diffstat (limited to 'src/recording')
-rw-r--r--src/recording/defs_recording.h1
-rw-r--r--src/recording/recordingmanager.cpp11
2 files changed, 8 insertions, 4 deletions
diff --git a/src/recording/defs_recording.h b/src/recording/defs_recording.h
index 7bcc90441e..50600096cf 100644
--- a/src/recording/defs_recording.h
+++ b/src/recording/defs_recording.h
@@ -11,6 +11,7 @@
#define RECORD_OFF 0.0
#define RECORD_READY 1.0
#define RECORD_ON 2.0
+#define RECORD_SPLIT_CONTINUE 3.0
//File options for preferences Splitting
#define SPLIT_650MB "650 MB (CD)"
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index 75d7317cb4..af6a39baff 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -112,6 +112,9 @@ void RecordingManager::startRecording(bool generateFileName) {
m_recordingLocation = m_recording_base_file + "."+ encodingType.toLower();
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), m_recording_base_file +".cue");
+
+ m_recReady->set(RECORD_READY);
+
} else {
// This is only executed if filesplit occurs.
++m_iNumberSplits;
@@ -122,9 +125,10 @@ void RecordingManager::startRecording(bool generateFileName) {
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), new_base_filename +".cue");
m_recordingFile = QFileInfo(m_recordingLocation).fileName();
- }
- m_recReady->set(RECORD_READY);
+ m_recReady->set(RECORD_SPLIT_CONTINUE);
+
+ }
m_iNumberOfBytesRecordedSplit = 0;
m_secondsRecordedSplit=0;
}
@@ -139,6 +143,7 @@ void RecordingManager::stopRecording()
m_secondsRecorded = 0;
}
+
void RecordingManager::setRecordingDir() {
QDir recordDir(m_pConfig->getValueString(
ConfigKey(RECORDING_PREF_KEY, "Directory")));
@@ -170,7 +175,6 @@ void RecordingManager::slotDurationRecorded(quint64 duration)
if(duration >= m_split_time)
{
qDebug() << "Splitting after " << duration << " seconds";
- stopRecording();
// Dont generate a new filename.
// This will reuse the previous filename but append a suffix.
startRecording(false);
@@ -194,7 +198,6 @@ void RecordingManager::slotBytesRecorded(int bytes)
if(m_iNumberOfBytesRecordedSplit >= m_split_size)
{
qDebug() << "Splitting after " << m_iNumberOfBytesRecorded << " bytes written";
- stopRecording();
// Dont generate a new filename.
// This will reuse the previous filename but append a suffix.
startRecording(false);