OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement renaming of scenes/sources

Browse source
This commit is contained in:
jp9000 2014-06-30 00:06:01 -07:00
parent dc27cb2051
commit 11a7b57cd8
2 changed files with 106 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
obs/window-basic-main.cpp
View file

@ -74,6 +74,20 @@ OBSBasic::OBSBasic(QWidget *parent)
blog(LOG_INFO, "%s", name.str().c_str());
setWindowTitle(QT_UTF8(name.str().c_str()));
connect(ui->scenes->itemDelegate(),
SIGNAL(closeEditor(QWidget*,
QAbstractItemDelegate::EndEditHint)),
this,
SLOT(SceneNameEdited(QWidget*,
QAbstractItemDelegate::EndEditHint)));
connect(ui->sources->itemDelegate(),
SIGNAL(closeEditor(QWidget*,
QAbstractItemDelegate::EndEditHint)),
this,
SLOT(SceneItemNameEdited(QWidget*,
QAbstractItemDelegate::EndEditHint)));
}
static void SaveAudioDevice(const char *name, int channel, obs_data_t parent)
@ -436,6 +450,8 @@ void OBSBasic::InitOBSCallbacks()
OBSBasic::SourceActivated, this);
signal_handler_connect(obs_signalhandler(), "source_deactivate",
OBSBasic::SourceDeactivated, this);
signal_handler_connect(obs_signalhandler(), "source_rename",
OBSBasic::SourceRenamed, this);
}
void OBSBasic::InitPrimitives()
@ -579,6 +595,7 @@ void OBSBasic::InsertSceneItem(obs_sceneitem_t item)
const char *name = obs_source_getname(source);
QListWidgetItem *listItem = new QListWidgetItem(QT_UTF8(name));
listItem->setFlags(listItem->flags() | Qt::ItemIsEditable);
listItem->setData(Qt::UserRole,
QVariant::fromValue(OBSSceneItem(item)));
@ -601,6 +618,7 @@ void OBSBasic::AddScene(OBSSource source)
obs_scene_t scene = obs_scene_fromsource(source);
QListWidgetItem *item = new QListWidgetItem(QT_UTF8(name));
item->setFlags(item->flags() | Qt::ItemIsEditable);
item->setData(Qt::UserRole, QVariant::fromValue(OBSScene(scene)));
ui->scenes->addItem(item);
@ -697,6 +715,22 @@ void OBSBasic::UpdateSceneSelection(OBSSource source)
}
}
static void RenameListValues(QListWidget *listWidget, const QString &newName,
const QString &prevName)
{
QList<QListWidgetItem*> items =
listWidget->findItems(prevName, Qt::MatchExactly);
for (int i = 0; i < items.count(); i++)
items[i]->setText(newName);
}
void OBSBasic::RenameSources(QString newName, QString prevName)
{
RenameListValues(ui->scenes, newName, prevName);
RenameListValues(ui->sources, newName, prevName);
}
void OBSBasic::MoveSceneItem(OBSSceneItem item, order_movement movement)
{
OBSScene scene = obs_sceneitem_getscene(item);
@ -819,6 +853,17 @@ void OBSBasic::SourceDeactivated(void *data, calldata_t params)
Q_ARG(OBSSource, OBSSource(source)));
}
void OBSBasic::SourceRenamed(void *data, calldata_t params)
{
const char *newName = calldata_string(params, "new_name");
const char *prevName = calldata_string(params, "prev_name");
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
"RenameSources",
Q_ARG(QString, QT_UTF8(newName)),
Q_ARG(QString, QT_UTF8(prevName)));
}
void OBSBasic::ChannelChanged(void *data, calldata_t params)
{
obs_source_t source = (obs_source_t)calldata_ptr(params, "source");
@ -1475,6 +1520,58 @@ void OBSBasic::logUploadFinished()
logDialog.exec();
}
void OBSBasic::SceneNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint)
{
OBSScene scene = GetCurrentScene();
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
string text = QT_TO_UTF8(edit->text());
if (!scene)
return;
obs_source_t sceneSource = obs_scene_getsource(scene);
const char *prevName = obs_source_getname(sceneSource);
obs_source_t source = obs_get_source_by_name(text.c_str());
if (source) {
QListWidgetItem *listItem = ui->scenes->currentItem();
if (listItem)
listItem->setText(QT_UTF8(prevName));
obs_source_release(source);
} else {
obs_source_setname(sceneSource, text.c_str());
}
UNUSED_PARAMETER(endHint);
}
void OBSBasic::SceneItemNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint)
{
OBSSceneItem item = GetCurrentSceneItem();
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
string text = QT_TO_UTF8(edit->text());
if (!item)
return;
obs_source_t itemSource = obs_sceneitem_getsource(item);
const char *prevName = obs_source_getname(itemSource);
obs_source_t source = obs_get_source_by_name(text.c_str());
if (source) {
QListWidgetItem *listItem = ui->sources->currentItem();
if (listItem)
listItem->setText(QT_UTF8(prevName));
obs_source_release(source);
} else {
obs_source_setname(itemSource, text.c_str());
}
UNUSED_PARAMETER(endHint);
}
void OBSBasic::StreamingStart()
{
ui->streamButton->setText("Stop Streaming");

11
obs/window-basic-main.hpp
View file

@ -138,14 +138,13 @@ private slots:
void AddScene(OBSSource source);
void RemoveScene(OBSSource source);
void UpdateSceneSelection(OBSSource source);
void RenameSources(QString newName, QString prevName);
void MoveSceneItem(OBSSceneItem item, order_movement movement);
void ActivateAudioSource(OBSSource source);
void DeactivateAudioSource(OBSSource source);
void AddSourceFromAction();
private:
/* OBS Callbacks */
static void SceneItemAdded(void *data, calldata_t params);
@ -154,6 +153,7 @@ private:
static void SourceRemoved(void *data, calldata_t params);
static void SourceActivated(void *data, calldata_t params);
static void SourceDeactivated(void *data, calldata_t params);
static void SourceRenamed(void *data, calldata_t params);
static void ChannelChanged(void *data, calldata_t params);
static void RenderMain(void *data, uint32_t cx, uint32_t cy);
@ -242,6 +242,13 @@ private slots:
void logUploadRead();
void logUploadFinished();
void AddSourceFromAction();
void SceneNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint);
void SceneItemNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint);
public:
explicit OBSBasic(QWidget *parent = 0);
virtual ~OBSBasic();