mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
clang-format: Indent namespaces
This commit is contained in:
@ -64,7 +64,7 @@ IndentWidth: 8
|
||||
IndentWrappedFunctionNames: false
|
||||
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: None
|
||||
NamespaceIndentation: All
|
||||
#ObjCBinPackProtocolList: Auto # requires clang-format 7
|
||||
ObjCBlockIndentWidth: 8
|
||||
ObjCSpaceAfterProperty: true
|
||||
|
@ -163,7 +163,8 @@ enum EventSubscription {
|
||||
* @initialVersion 5.0.0
|
||||
* @api enums
|
||||
*/
|
||||
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors | Ui),
|
||||
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors |
|
||||
Ui),
|
||||
/**
|
||||
* Subscription value to receive the `InputVolumeMeters` high-volume event.
|
||||
*
|
||||
|
@ -26,5 +26,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
||||
namespace RequestBatchHandler {
|
||||
std::vector<RequestResult> ProcessRequestBatch(QThreadPool &threadPool, SessionPtr session,
|
||||
RequestBatchExecutionType::RequestBatchExecutionType executionType,
|
||||
std::vector<RequestBatchRequest> &requests, json &variables, bool haltOnFailure);
|
||||
std::vector<RequestBatchRequest> &requests, json &variables,
|
||||
bool haltOnFailure);
|
||||
}
|
||||
|
@ -77,8 +77,5 @@ enum RequestBatchExecutionType : int8_t {
|
||||
Parallel = 2,
|
||||
};
|
||||
|
||||
inline bool IsValid(int8_t executionType)
|
||||
{
|
||||
return executionType >= None && executionType <= Parallel;
|
||||
}
|
||||
inline bool IsValid(int8_t executionType) { return executionType >= None && executionType <= Parallel; }
|
||||
}
|
||||
|
@ -77,9 +77,6 @@ obs_data_t *JsonToObsData(json j);
|
||||
json ObsDataToJson(obs_data_t *d, bool includeDefault = false);
|
||||
bool GetJsonFileContent(std::string fileName, json &content);
|
||||
bool SetJsonFileContent(std::string fileName, const json &content, bool createNew = true);
|
||||
static inline bool Contains(const json &j, std::string key)
|
||||
{
|
||||
return j.contains(key) && !j[key].is_null();
|
||||
}
|
||||
static inline bool Contains(const json &j, std::string key) { return j.contains(key) && !j[key].is_null(); }
|
||||
}
|
||||
}
|
||||
|
@ -219,12 +219,15 @@ obs_sceneitem_t *GetSceneItemByName(obs_scene_t *scene, std::string name,
|
||||
}
|
||||
|
||||
namespace ActionHelper {
|
||||
obs_sceneitem_t *CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled = true,
|
||||
obs_sceneitem_t *
|
||||
CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled = true,
|
||||
obs_transform_info *sceneItemTransform = nullptr,
|
||||
obs_sceneitem_crop *sceneItemCrop = nullptr); // Increments ref. Use OBSSceneItemAutoRelease
|
||||
obs_sceneitem_t *CreateInput(std::string inputName, std::string inputKind, obs_data_t *inputSettings, obs_scene_t *scene,
|
||||
obs_sceneitem_t *CreateInput(std::string inputName, std::string inputKind, obs_data_t *inputSettings,
|
||||
obs_scene_t *scene,
|
||||
bool sceneItemEnabled = true); // Increments ref. Use OBSSceneItemAutoRelease
|
||||
obs_source_t *CreateSourceFilter(obs_source_t *source, std::string filterName, std::string filterKind,
|
||||
obs_source_t *
|
||||
CreateSourceFilter(obs_source_t *source, std::string filterName, std::string filterKind,
|
||||
obs_data_t *filterSettings); // Increments source ref. Use OBSSourceAutoRelease
|
||||
void SetSourceFilterIndex(obs_source_t *source, obs_source_t *filter, size_t index);
|
||||
}
|
||||
|
@ -65,7 +65,8 @@ private:
|
||||
void ProcessPeak(const struct audio_data *data);
|
||||
void ProcessMagnitude(const struct audio_data *data);
|
||||
|
||||
static void InputAudioCaptureCallback(void *priv_data, obs_source_t *source, const struct audio_data *data, bool muted);
|
||||
static void InputAudioCaptureCallback(void *priv_data, obs_source_t *source,
|
||||
const struct audio_data *data, bool muted);
|
||||
static void InputVolumeCallback(void *priv_data, calldata_t *cd);
|
||||
};
|
||||
|
||||
|
@ -122,8 +122,5 @@ enum WebSocketOpCode : uint8_t {
|
||||
RequestBatchResponse = 9,
|
||||
};
|
||||
|
||||
inline bool IsValid(uint8_t opCode)
|
||||
{
|
||||
return opCode >= Hello && opCode <= RequestBatchResponse;
|
||||
}
|
||||
inline bool IsValid(uint8_t opCode) { return opCode >= Hello && opCode <= RequestBatchResponse; }
|
||||
}
|
||||
|
Reference in New Issue
Block a user