mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-01-18 19:28:56 -05:00
Merge pull request #5371 from norihiro/automatic-file-splitting
Automatic file splitting
This commit is contained in:
@@ -1424,6 +1424,12 @@ bool OBSBasic::InitBasicConfigDefaults()
|
||||
config_set_default_uint(basicConfig, "AdvOut", "Track5Bitrate", 160);
|
||||
config_set_default_uint(basicConfig, "AdvOut", "Track6Bitrate", 160);
|
||||
|
||||
config_set_default_uint(basicConfig, "AdvOut", "RecSplitFileTime", 900);
|
||||
config_set_default_uint(basicConfig, "AdvOut", "RecSplitFileSize",
|
||||
2048);
|
||||
config_set_default_bool(basicConfig, "AdvOut",
|
||||
"RecSplitFileResetTimestamps", true);
|
||||
|
||||
config_set_default_bool(basicConfig, "AdvOut", "RecRB", false);
|
||||
config_set_default_uint(basicConfig, "AdvOut", "RecRBTime", 20);
|
||||
config_set_default_int(basicConfig, "AdvOut", "RecRBSize", 512);
|
||||
@@ -7055,7 +7061,7 @@ void OBSBasic::StreamingStop(int code, QString last_error)
|
||||
SetBroadcastFlowEnabled(auth && auth->broadcastFlow());
|
||||
}
|
||||
|
||||
void OBSBasic::AutoRemux(QString input)
|
||||
void OBSBasic::AutoRemux(QString input, bool no_show)
|
||||
{
|
||||
bool autoRemux = config_get_bool(Config(), "Video", "AutoRemux");
|
||||
|
||||
@@ -7087,7 +7093,8 @@ void OBSBasic::AutoRemux(QString input)
|
||||
output += "mp4";
|
||||
|
||||
OBSRemux *remux = new OBSRemux(QT_TO_UTF8(path), this, true);
|
||||
remux->show();
|
||||
if (!no_show)
|
||||
remux->show();
|
||||
remux->AutoRemux(input, output);
|
||||
}
|
||||
|
||||
@@ -7240,6 +7247,14 @@ void OBSBasic::RecordingStop(int code, QString last_error)
|
||||
UpdatePause(false);
|
||||
}
|
||||
|
||||
void OBSBasic::RecordingFileChanged(QString lastRecordingPath)
|
||||
{
|
||||
QString str = QTStr("Basic.StatusBar.RecordingSavedTo");
|
||||
ShowStatusBarMessage(str.arg(lastRecordingPath));
|
||||
|
||||
AutoRemux(lastRecordingPath, true);
|
||||
}
|
||||
|
||||
void OBSBasic::ShowReplayBufferPauseWarning()
|
||||
{
|
||||
auto msgBox = []() {
|
||||
|
||||
Reference in New Issue
Block a user