Skip to content

Commit 44caf35

Browse files
WarmUpTillWarmUpTill
committed
Add option to add new recording chapter
1 parent a3b3cf9 commit 44caf35

File tree

9 files changed

+37
-9
lines changed

9 files changed

+37
-9
lines changed

‎data/locale/de-DE.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ AdvSceneSwitcher.action.recording.type.unpause="Aufnahme nicht mehr pausieren"
414414
AdvSceneSwitcher.action.recording.type.split="Aufnahme-Datei teilen"
415415
AdvSceneSwitcher.action.recording.pause.hint="Bitte beachten, dass je nach Aufnahmeeinstellung die Aufnahme möglicherweise nicht unterbrochen werden kann"
416416
AdvSceneSwitcher.action.recording.split.hint="Vergewissern, dass die automatische Dateiaufteilung in den OBS-Einstellungen aktiviert ist!"
417-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
418417
AdvSceneSwitcher.action.replay="Replay Buffer"
419418
AdvSceneSwitcher.action.replay.saveWarn="Warnung: Ein zu häufiges Speichern kann dazu führen, dass der Replay Buffer nicht gespeichert wird!"
420419
AdvSceneSwitcher.action.replay.type.stop="Replay Buffer stoppen"

‎data/locale/en-US.ini‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,9 +858,10 @@ AdvSceneSwitcher.action.recording.type.unpause="Unpause recording"
858858
AdvSceneSwitcher.action.recording.type.split="Split recording file"
859859
AdvSceneSwitcher.action.recording.type.changeOutputFolder="Change output folder"
860860
AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="Change filename formatting"
861+
AdvSceneSwitcher.action.recording.type.addChapter="Add chapter"
861862
AdvSceneSwitcher.action.recording.pause.hint="Note that depending on your recording settings you might not be able to pause recording"
862863
AdvSceneSwitcher.action.recording.split.hint="Make sure to enable automatic file splitting in the OBS settings first!"
863-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
864+
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{chapterName}}{{pauseHint}}{{splitHint}}"
864865
AdvSceneSwitcher.action.replay="Replay buffer"
865866
AdvSceneSwitcher.action.replay.saveWarn="Warning: Saving too frequently might result in the replay buffer not actually being saved!"
866867
AdvSceneSwitcher.action.replay.durationWarn="Warning: Changing the maximum replay time will only apply the next time the replay buffer is started!"

‎data/locale/es-ES.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ AdvSceneSwitcher.action.recording.type.start="Iniciar grabación"
335335
AdvSceneSwitcher.action.recording.type.pause="Pausar grabación"
336336
AdvSceneSwitcher.action.recording.type.unpause="Reanudar grabación"
337337
AdvSceneSwitcher.action.recording.pause.hint="Tenga en cuenta que, dependiendo de la configuración de grabación, es posible que no pueda pausar la grabación"
338-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
339338
AdvSceneSwitcher.action.replay="Búfer de reproducción"
340339
AdvSceneSwitcher.action.replay.saveWarn="Advertencia: ¡Guardar con demasiada frecuencia puede hacer que el búfer de reproducción no se guarde realmente!"
341340
AdvSceneSwitcher.action.replay.type.stop="Detener el búfer de reproducción"

‎data/locale/pt-BR.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,6 @@ AdvSceneSwitcher.action.recording.type.changeOutputFolder="Alterar pasta de saí
757757
AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="Alterar formatação do nome do arquivo"
758758
AdvSceneSwitcher.action.recording.pause.hint="Observe que dependendo das suas configurações de gravação, você pode não conseguir pausar a gravação"
759759
AdvSceneSwitcher.action.recording.split.hint="Certifique-se de habilitar a divisão automática de arquivos nas configurações do OBS primeiro!"
760-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
761760
AdvSceneSwitcher.action.replay="Buffer de replay"
762761
AdvSceneSwitcher.action.replay.saveWarn="Aviso: Salvar com muita frequência pode resultar em o buffer de replay não ser realmente salvo!"
763762
AdvSceneSwitcher.action.replay.durationWarn="Aviso: Alterar o tempo máximo de replay só se aplicará na próxima vez que o buffer de replay for iniciado!"

‎data/locale/ru-RU.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ AdvSceneSwitcher.action.recording.type.start="Начать запись"
131131
AdvSceneSwitcher.action.recording.type.pause="Пауза записи"
132132
AdvSceneSwitcher.action.recording.type.unpause="Снять запись с паузы"
133133
AdvSceneSwitcher.action.recording.pause.hint="Обратите внимание, что в зависимости от настроек записи вы можете не иметь возможности приостановить запись"
134-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
135134
AdvSceneSwitcher.action.replay="Буфер воспроизведения"
136135
AdvSceneSwitcher.action.replay.type.stop="Остановить буфер воспроизведения"
137136
AdvSceneSwitcher.action.replay.type.start="Начать воспроизведение буфера"

‎data/locale/tr-TR.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ AdvSceneSwitcher.action.recording.type.start="Kayıt Başlat"
267267
AdvSceneSwitcher.action.recording.type.pause="Kayıt Duraklat"
268268
AdvSceneSwitcher.action.recording.type.unpause="Kayıt Duraklatma"
269269
AdvSceneSwitcher.action.recording.pause.hint="Kayıt ayarlarınıza bağlı olarak kaydı duraklatamayabileceğinizi unutmayın."
270-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
271270
AdvSceneSwitcher.action.replay="Tekrar arabelleği"
272271
AdvSceneSwitcher.action.replay.type.stop="Tekrar arabelleğini durdur"
273272
AdvSceneSwitcher.action.replay.type.start="Tekrar arabelleğini başlat"

‎data/locale/zh-CN.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,6 @@ AdvSceneSwitcher.action.recording.type.changeOutputFolder="更改输出文件夹
816816
AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="改变文件名的格式"
817817
AdvSceneSwitcher.action.recording.pause.hint="请注意，根据您的录制设置，您可能无法暂停录制"
818818
AdvSceneSwitcher.action.recording.split.hint="注意，请先确保在OBS设置中启用自动分割文件!"
819-
AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
820819
AdvSceneSwitcher.action.replay="回放缓存"
821820
AdvSceneSwitcher.action.replay.saveWarn="警告：保存过于频繁可能会导致回放缓存实际上未保存!"
822821
AdvSceneSwitcher.action.replay.durationWarn="警告：更改回放缓存时长上限，仅适用于下次回放缓存开启时!"

‎plugins/base/macro-action-recording.cpp‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,18 @@ const static std::map<MacroActionRecord::Action, std::string> actionTypes = {
2222
"AdvSceneSwitcher.action.recording.type.pause"},
2323
{MacroActionRecord::Action::UNPAUSE,
2424
"AdvSceneSwitcher.action.recording.type.unpause"},
25+
#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(28, 0, 0)
2526
{MacroActionRecord::Action::SPLIT,
2627
"AdvSceneSwitcher.action.recording.type.split"},
28+
#endif
2729
{MacroActionRecord::Action::FOLDER,
2830
"AdvSceneSwitcher.action.recording.type.changeOutputFolder"},
2931
{MacroActionRecord::Action::FILE_FORMAT,
3032
"AdvSceneSwitcher.action.recording.type.changeOutputFileFormat"},
33+
#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 2, 0)
34+
{MacroActionRecord::Action::ADD_CHAPTER,
35+
"AdvSceneSwitcher.action.recording.type.addChapter"},
36+
#endif
3137
};
3238

3339
bool MacroActionRecord::PerformAction()
@@ -87,6 +93,13 @@ bool MacroActionRecord::PerformAction()
8793
}
8894
break;
8995
}
96+
#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 2, 0)
97+
case Action::ADD_CHAPTER:
98+
if (!obs_frontend_recording_add_chapter(_chapterName.c_str())) {
99+
blog(LOG_WARNING, "failed to add recoding chapter!");
100+
}
101+
break;
102+
#endif
90103
default:
91104
break;
92105
}
@@ -110,6 +123,7 @@ bool MacroActionRecord::Save(obs_data_t *obj) const
110123
obs_data_set_int(obj, "action", static_cast<int>(_action));
111124
_folder.Save(obj, "folder");
112125
_fileFormat.Save(obj, "format");
126+
_chapterName.Save(obj, "chapterName");
113127
return true;
114128
}
115129

@@ -119,6 +133,7 @@ bool MacroActionRecord::Load(obs_data_t *obj)
119133
_action = static_cast<Action>(obs_data_get_int(obj, "action"));
120134
_folder.Load(obj, "folder");
121135
_fileFormat.Load(obj, "format");
136+
_chapterName.Load(obj, "chapterName");
122137
return true;
123138
}
124139

@@ -136,6 +151,7 @@ void MacroActionRecord::ResolveVariablesToFixedValues()
136151
{
137152
_folder.ResolveVariables();
138153
_fileFormat.ResolveVariables();
154+
_chapterName.ResolveVariables();
139155
}
140156

141157
static inline void populateActionSelection(QComboBox *list)
@@ -154,7 +170,8 @@ MacroActionRecordEdit::MacroActionRecordEdit(
154170
_splitHint(new QLabel(obs_module_text(
155171
"AdvSceneSwitcher.action.recording.split.hint"))),
156172
_recordFolder(new FileSelection(FileSelection::Type::FOLDER, this)),
157-
_recordFileFormat(new VariableLineEdit(this))
173+
_recordFileFormat(new VariableLineEdit(this)),
174+
_chapterName(new VariableLineEdit(this))
158175
{
159176
populateActionSelection(_actions);
160177

@@ -164,6 +181,8 @@ MacroActionRecordEdit::MacroActionRecordEdit(
164181
this, SLOT(FolderChanged(const QString &)));
165182
QWidget::connect(_recordFileFormat, SIGNAL(editingFinished()), this,
166183
SLOT(FormatStringChanged()));
184+
QWidget::connect(_chapterName, SIGNAL(editingFinished()), this,
185+
SLOT(ChapterNameChanged()));
167186

168187
auto mainLayout = new QHBoxLayout;
169188
PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.recording.entry"),
@@ -172,7 +191,8 @@ MacroActionRecordEdit::MacroActionRecordEdit(
172191
{"{{pauseHint}}", _pauseHint},
173192
{"{{splitHint}}", _splitHint},
174193
{"{{recordFolder}}", _recordFolder},
175-
{"{{recordFileFormat}}", _recordFileFormat}});
194+
{"{{recordFileFormat}}", _recordFileFormat},
195+
{"{{chapterName}}", _chapterName}});
176196
setLayout(mainLayout);
177197

178198
_entryData = entryData;
@@ -188,6 +208,7 @@ void MacroActionRecordEdit::UpdateEntryData()
188208
_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
189209
_recordFolder->SetPath(_entryData->_folder);
190210
_recordFileFormat->setText(_entryData->_fileFormat);
211+
_chapterName->setText(_entryData->_chapterName);
191212
SetWidgetVisibility();
192213
}
193214

@@ -209,6 +230,12 @@ void MacroActionRecordEdit::FormatStringChanged()
209230
_entryData->_fileFormat = _recordFileFormat->text().toStdString();
210231
}
211232

233+
void MacroActionRecordEdit::ChapterNameChanged()
234+
{
235+
GUARD_LOADING_AND_LOCK();
236+
_entryData->_chapterName = _chapterName->text().toStdString();
237+
}
238+
212239
void MacroActionRecordEdit::SetWidgetVisibility()
213240
{
214241
_pauseHint->setVisible(isPauseAction(_entryData->_action));
@@ -218,6 +245,8 @@ void MacroActionRecordEdit::SetWidgetVisibility()
218245
MacroActionRecord::Action::FOLDER);
219246
_recordFileFormat->setVisible(_entryData->_action ==
220247
MacroActionRecord::Action::FILE_FORMAT);
248+
_chapterName->setVisible(_entryData->_action ==
249+
MacroActionRecord::Action::ADD_CHAPTER);
221250
}
222251

223252
void MacroActionRecordEdit::ActionChanged(int value)

‎plugins/base/macro-action-recording.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ class MacroActionRecord : public MacroAction {
2929
SPLIT,
3030
FOLDER,
3131
FILE_FORMAT,
32+
ADD_CHAPTER,
3233
};
3334
Action _action = Action::STOP;
3435

3536
StringVariable _folder = QDir::homePath().toStdString() + "/Videos";
3637
StringVariable _fileFormat = "%CCYY-%MM-%DD %hh-%mm-%ss";
38+
StringVariable _chapterName = "";
3739

3840
private:
3941
static bool _registered;
@@ -60,13 +62,15 @@ private slots:
6062
void ActionChanged(int value);
6163
void FolderChanged(const QString &);
6264
void FormatStringChanged();
65+
void ChapterNameChanged();
6366

6467
protected:
6568
QComboBox *_actions;
6669
QLabel *_pauseHint;
6770
QLabel *_splitHint;
6871
FileSelection *_recordFolder;
6972
VariableLineEdit *_recordFileFormat;
73+
VariableLineEdit *_chapterName;
7074
std::shared_ptr<MacroActionRecord> _entryData;
7175

7276
private:

0 commit comments

Comments
 (0)