Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-20 00:05:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mark free functions static where applicable

Browse Source
This commit is contained in:
WarmUpTill
2023-04-29 22:56:45 +02:00
committed by WarmUpTill
parent 5967c83b03
commit 443ffb7906
27 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/connection-manager.cpp
View File

@@ -88,7 +88,7 @@ Connection::~Connection()
_client.Disconnect();
}
std::string GetUri(std::string addr, int port)
static std::string GetUri(std::string addr, int port)
{
return "ws://" + addr + ":" + std::to_string(port);
}
@@ -161,12 +161,12 @@ std::string GetWeakConnectionName(std::weak_ptr<Connection> connection)
return con->Name();
}
bool ConnectionNameAvailable(const QString &name)
static bool ConnectionNameAvailable(const QString &name)
{
return !GetConnectionByName(name);
}
bool ConnectionNameAvailable(const std::string &name)
static bool ConnectionNameAvailable(const std::string &name)
{
return ConnectionNameAvailable(QString::fromStdString(name));
}

8
src/utils/item-selection-helpers.cpp
View File

@@ -31,14 +31,14 @@ static Item *GetItemByName(const QString &name,
return GetItemByName(name.toStdString(), items);
}
bool ItemNameAvailable(const QString &name,
std::deque<std::shared_ptr<Item>> &items)
static bool ItemNameAvailable(const QString &name,
std::deque<std::shared_ptr<Item>> &items)
{
return !GetItemByName(name, items);
}
bool ItemNameAvailable(const std::string &name,
std::deque<std::shared_ptr<Item>> &items)
static bool ItemNameAvailable(const std::string &name,
std::deque<std::shared_ptr<Item>> &items)
{
return ItemNameAvailable(QString::fromStdString(name), items);
}

12
src/utils/scene-item-selection.cpp
View File

@@ -95,8 +95,8 @@ static bool getSceneItems(obs_scene_t *, obs_sceneitem_t *item, void *ptr)
return true;
}
std::vector<obs_scene_item *> getSceneItemsWithName(obs_scene_t *scene,
std::string &name)
static std::vector<obs_scene_item *>
getSceneItemsWithName(obs_scene_t *scene, const std::string &name)
{
ItemInfo itemInfo = {name};
obs_scene_enum_items(scene, getSceneItems, &itemInfo);
@@ -123,9 +123,9 @@ static bool countSceneItem(obs_scene_t *, obs_sceneitem_t *item, void *ptr)
return true;
}
int getCountOfSceneItemOccurance(const SceneSelection &s,
const std::string &name,
bool enumAllScenes = true)
static int getCountOfSceneItemOccurance(const SceneSelection &s,
const std::string &name,
bool enumAllScenes = true)
{
ItemCountData data{name};
if (enumAllScenes && (s.GetType() != SceneSelection::Type::SCENE)) {
@@ -216,7 +216,7 @@ static bool enumSceneItem(obs_scene_t *, obs_sceneitem_t *item, void *ptr)
return true;
}
void populateSceneItemSelection(QComboBox *list)
static void populateSceneItemSelection(QComboBox *list)
{
QStringList names;
obs_scene_enum_items(nullptr, enumSceneItem, &names);

2
src/utils/scene-selection.cpp
View File

@@ -86,7 +86,7 @@ void SceneSelection::Load(obs_data_t *obj, const char *name,
obs_data_release(data);
}
bool IsScene(const OBSWeakSource &source)
static bool IsScene(const OBSWeakSource &source)
{
auto s = obs_weak_source_get_source(source);
bool ret = !!obs_scene_from_source(s);

5
src/utils/websocket-helpers.cpp
View File

@@ -34,7 +34,8 @@ void SendWebsocketEvent(const std::string &eventMsg)
obs_data_release(data);
}
void ReceiveWebsocketMessage(obs_data_t *request_data, obs_data_t *, void *)
static void receiveWebsocketMessage(obs_data_t *request_data, obs_data_t *,
void *)
{
if (!obs_data_has_user_value(request_data, "message")) {
vblog(LOG_INFO, "received unexpected m '%s'",
@@ -58,7 +59,7 @@ extern "C" void RegisterWebsocketVendor()
}
if (!obs_websocket_vendor_register_request(
vendor, VendorRequest, ReceiveWebsocketMessage, NULL))
vendor, VendorRequest, receiveWebsocketMessage, NULL))
blog(LOG_ERROR,
"Failed to register `AdvancedSceneSwitcherMessage` request with obs-websocket.");