UI: Add name/version to window title
Also, make the 'start stream' button say 'connecting...' when it's initially trying to connect.
This commit is contained in:
parent
f5e85e167b
commit
cfaf0d32af
@ -64,6 +64,7 @@ Basic.Main.AddSourceHelp.Text="You need to have at least 1 scene to add a source
|
|||||||
# basic mode main window
|
# basic mode main window
|
||||||
Basic.Main.Scenes="Scenes"
|
Basic.Main.Scenes="Scenes"
|
||||||
Basic.Main.Sources="Sources"
|
Basic.Main.Sources="Sources"
|
||||||
|
Basic.Main.Connecting="Connecting..."
|
||||||
Basic.Main.StartRecording="Start Recording"
|
Basic.Main.StartRecording="Start Recording"
|
||||||
Basic.Main.StartStreaming="Start Streaming"
|
Basic.Main.StartStreaming="Start Streaming"
|
||||||
Basic.Main.StopRecording="Stop Recording"
|
Basic.Main.StopRecording="Stop Recording"
|
||||||
|
@ -201,6 +201,22 @@ void OBSApp::OBSInit()
|
|||||||
mainWindow->OBSInit();
|
mainWindow->OBSInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string OBSApp::GetVersionString() const
|
||||||
|
{
|
||||||
|
stringstream ver;
|
||||||
|
ver << "v" <<
|
||||||
|
LIBOBS_API_MAJOR_VER << "." <<
|
||||||
|
LIBOBS_API_MINOR_VER << "." <<
|
||||||
|
LIBOBS_API_PATCH_VER;
|
||||||
|
|
||||||
|
if (sizeof(void*) == 8)
|
||||||
|
ver << " (64bit)";
|
||||||
|
else
|
||||||
|
ver << " (32bit)";
|
||||||
|
|
||||||
|
return ver.str();
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#define INPUT_AUDIO_SOURCE "coreaudio_input_capture"
|
#define INPUT_AUDIO_SOURCE "coreaudio_input_capture"
|
||||||
#define OUTPUT_AUDIO_SOURCE "coreaudio_output_capture"
|
#define OUTPUT_AUDIO_SOURCE "coreaudio_output_capture"
|
||||||
|
@ -69,6 +69,8 @@ public:
|
|||||||
return textLookup.GetString(lookupVal);
|
return textLookup.GetString(lookupVal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string GetVersionString() const;
|
||||||
|
|
||||||
const char *InputAudioSource() const;
|
const char *InputAudioSource() const;
|
||||||
const char *OutputAudioSource() const;
|
const char *OutputAudioSource() const;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
|
Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
|
||||||
Copyright (C) 2014 by Zachary Lund <admin@computerquip.com>
|
Zachary Lund <admin@computerquip.com>
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -66,6 +66,11 @@ OBSBasic::OBSBasic(QWidget *parent)
|
|||||||
if (obs_get_video_info(&ovi))
|
if (obs_get_video_info(&ovi))
|
||||||
ResizePreview(ovi.base_width, ovi.base_height);
|
ResizePreview(ovi.base_width, ovi.base_height);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
stringstream name;
|
||||||
|
name << "OBS " << App()->GetVersionString();
|
||||||
|
|
||||||
|
setWindowTitle(QT_UTF8(name.str().c_str()));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SaveAudioDevice(const char *name, int channel, obs_data_t parent)
|
static void SaveAudioDevice(const char *name, int channel, obs_data_t parent)
|
||||||
@ -1129,6 +1134,7 @@ void OBSBasic::on_actionSourceDown_triggered()
|
|||||||
void OBSBasic::StreamingStart()
|
void OBSBasic::StreamingStart()
|
||||||
{
|
{
|
||||||
ui->streamButton->setText("Stop Streaming");
|
ui->streamButton->setText("Stop Streaming");
|
||||||
|
ui->streamButton->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OBSBasic::StreamingStop(int code)
|
void OBSBasic::StreamingStop(int code)
|
||||||
@ -1159,6 +1165,7 @@ void OBSBasic::StreamingStop(int code)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
|
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
|
||||||
|
ui->streamButton->setEnabled(true);
|
||||||
|
|
||||||
if (code != OBS_OUTPUT_SUCCESS)
|
if (code != OBS_OUTPUT_SUCCESS)
|
||||||
QMessageBox::information(this,
|
QMessageBox::information(this,
|
||||||
@ -1180,6 +1187,9 @@ void OBSBasic::on_streamButton_clicked()
|
|||||||
int audioBitrate = config_get_uint(basicConfig, "SimpleOutput",
|
int audioBitrate = config_get_uint(basicConfig, "SimpleOutput",
|
||||||
"ABitrate");
|
"ABitrate");
|
||||||
|
|
||||||
|
ui->streamButton->setEnabled(false);
|
||||||
|
ui->streamButton->setText(QTStr("Basic.Main.Connecting"));
|
||||||
|
|
||||||
SaveService();
|
SaveService();
|
||||||
|
|
||||||
obs_data_setint(x264Settings, "bitrate", videoBitrate);
|
obs_data_setint(x264Settings, "bitrate", videoBitrate);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user