opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

(API Change) Remove pointers from all typedefs

Browse Source 
Typedef pointers are unsafe.  If you do:
typedef struct bla *bla_t;
then you cannot use it as a constant, such as: const bla_t, because
that constant will be to the pointer itself rather than to the
underlying data.  I admit this was a fundamental mistake that must
be corrected.

All typedefs that were pointer types will now have their pointers
removed from the type itself, and the pointers will be used when they
are actually used as variables/parameters/returns instead.

This does not break ABI though, which is pretty nice.
This commit is contained in:
jp9000
2014-09-25 21:48:11 -07:00
parent 4a06960188
commit c9df41c1e2
146 changed files with 3105 additions and 3079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
obs/window-basic-main.hpp
+28 -28
View File
@@ -52,7 +52,7 @@ class OBSBasic : public OBSMainWindow {
friend class OBSBasicPreview;
private:
std::unordered_map<obs_source_t, int> sourceSceneRefs;
std::unordered_map<obs_source_t*, int> sourceSceneRefs;
std::vector<VolControl*> volumes;
@@ -65,7 +65,7 @@ private:
QNetworkAccessManager networkManager;
QPointer<QTimer> cpuUsageTimer;
os_cpu_usage_info_t cpuUsageInfo = nullptr;
os_cpu_usage_info_t *cpuUsageInfo = nullptr;
QBuffer logUploadPostData;
QNetworkReply *logUploadReply = nullptr;
@@ -75,14 +75,14 @@ private:
QNetworkReply *updateReply = nullptr;
QByteArray updateReturnData;
obs_output_t fileOutput = nullptr;
obs_output_t streamOutput = nullptr;
obs_service_t service = nullptr;
obs_encoder_t aac = nullptr;
obs_encoder_t x264 = nullptr;
obs_output_t *fileOutput = nullptr;
obs_output_t *streamOutput = nullptr;
obs_service_t *service = nullptr;
obs_encoder_t *aac = nullptr;
obs_encoder_t *x264 = nullptr;
gs_vertbuffer_t box = nullptr;
gs_vertbuffer_t circle = nullptr;
gs_vertbuffer_t *box = nullptr;
gs_vertbuffer_t *circle = nullptr;
bool sceneChanging = false;
@@ -125,7 +125,7 @@ private:
OBSSceneItem GetSceneItem(QListWidgetItem *item);
OBSSceneItem GetCurrentSceneItem();
bool QueryRemoveSource(obs_source_t source);
bool QueryRemoveSource(obs_source_t *source);
void TimedCheckForUpdates();
void CheckForUpdates();
@@ -137,14 +137,14 @@ private:
void GetConfigFPS(uint32_t &num, uint32_t &den) const;
void UpdateSources(OBSScene scene);
void InsertSceneItem(obs_sceneitem_t item);
void InsertSceneItem(obs_sceneitem_t *item);
void TempFileOutput(const char *path, int vBitrate, int aBitrate);
void TempStreamOutput(const char *url, const char *key,
int vBitrate, int aBitrate);
void CreateInteractionWindow(obs_source_t source);
void CreatePropertiesWindow(obs_source_t source);
void CreateInteractionWindow(obs_source_t *source);
void CreatePropertiesWindow(obs_source_t *source);
public slots:
void StreamingStart();
@@ -171,20 +171,20 @@ private slots:
private:
/* OBS Callbacks */
static void SceneItemAdded(void *data, calldata_t params);
static void SceneItemRemoved(void *data, calldata_t params);
static void SourceAdded(void *data, calldata_t params);
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 SceneItemAdded(void *data, calldata_t *params);
static void SceneItemRemoved(void *data, calldata_t *params);
static void SourceAdded(void *data, calldata_t *params);
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);
static void SceneItemMoveUp(void *data, calldata_t params);
static void SceneItemMoveDown(void *data, calldata_t params);
static void SceneItemMoveTop(void *data, calldata_t params);
static void SceneItemMoveBottom(void *data, calldata_t params);
static void SceneItemMoveUp(void *data, calldata_t *params);
static void SceneItemMoveDown(void *data, calldata_t *params);
static void SceneItemMoveTop(void *data, calldata_t *params);
static void SceneItemMoveBottom(void *data, calldata_t *params);
void ResizePreview(uint32_t cx, uint32_t cy);
@@ -195,8 +195,8 @@ private:
public:
OBSScene GetCurrentScene();
obs_service_t GetService();
void SetService(obs_service_t service);
obs_service_t *GetService();
void SetService(obs_service_t *service);
int ResetVideo();
bool ResetAudio();
@@ -299,7 +299,7 @@ public:
virtual void OBSInit() override;
virtual config_t Config() const override;
virtual config_t *Config() const override;
private:
std::unique_ptr<Ui::OBSBasic> ui;