From 7608f77e8bc2afcd2c1d12342863ef519392ba57 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 9 Aug 2014 12:38:56 -0700 Subject: [PATCH] (API Change) Rename autoselect/default functions For the sake of consistency, renamed these two functions to include _value at the end so they are consistent. Renamed: To: ------------------------------------------------------- obs_data_has_default obs_data_has_default_value obs_data_has_autoselect obs_data_has_autoselect_value obs_data_item_has_default obs_data_item_has_default_value obs_data_item_has_autoselect obs_data_item_has_autoselect_value --- libobs/obs-data.c | 12 ++++++------ libobs/obs-data.h | 8 ++++---- obs/properties-view.cpp | 2 +- plugins/mac-avcapture/av-capture.m | 2 +- plugins/win-dshow/win-dshow.cpp | 7 +++++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libobs/obs-data.c b/libobs/obs-data.c index f3b58ed22..b1c6ccfc3 100644 --- a/libobs/obs-data.c +++ b/libobs/obs-data.c @@ -1132,14 +1132,14 @@ bool obs_data_has_user_value(obs_data_t data, const char *name) return data && obs_data_item_has_user_value(get_item(data, name)); } -bool obs_data_has_default(obs_data_t data, const char *name) +bool obs_data_has_default_value(obs_data_t data, const char *name) { - return data && obs_data_item_has_default(get_item(data, name)); + return data && obs_data_item_has_default_value(get_item(data, name)); } -bool obs_data_has_autoselect(obs_data_t data, const char *name) +bool obs_data_has_autoselect_value(obs_data_t data, const char *name) { - return data && obs_data_item_has_autoselect(get_item(data, name)); + return data && obs_data_item_has_autoselect_value(get_item(data, name)); } bool obs_data_item_has_user_value(obs_data_item_t item) @@ -1147,12 +1147,12 @@ bool obs_data_item_has_user_value(obs_data_item_t item) return item && item->data_size; } -bool obs_data_item_has_default(obs_data_item_t item) +bool obs_data_item_has_default_value(obs_data_item_t item) { return item && item->default_size; } -bool obs_data_item_has_autoselect(obs_data_item_t item) +bool obs_data_item_has_autoselect_value(obs_data_item_t item) { return item && item->autoselect_size; } diff --git a/libobs/obs-data.h b/libobs/obs-data.h index 12f159f0d..d6d46c129 100644 --- a/libobs/obs-data.h +++ b/libobs/obs-data.h @@ -157,12 +157,12 @@ EXPORT void obs_data_array_erase(obs_data_array_t array, size_t idx); /* Item status inspection */ EXPORT bool obs_data_has_user_value(obs_data_t data, const char *name); -EXPORT bool obs_data_has_default(obs_data_t data, const char *name); -EXPORT bool obs_data_has_autoselect(obs_data_t data, const char *name); +EXPORT bool obs_data_has_default_value(obs_data_t data, const char *name); +EXPORT bool obs_data_has_autoselect_value(obs_data_t data, const char *name); EXPORT bool obs_data_item_has_user_value(obs_data_item_t data); -EXPORT bool obs_data_item_has_default(obs_data_item_t data); -EXPORT bool obs_data_item_has_autoselect(obs_data_item_t data); +EXPORT bool obs_data_item_has_default_value(obs_data_item_t data); +EXPORT bool obs_data_item_has_autoselect_value(obs_data_item_t data); /* ------------------------------------------------------------------------- */ /* Clearing data values */ diff --git a/obs/properties-view.cpp b/obs/properties-view.cpp index 6ab1fff30..bd40dd6bd 100644 --- a/obs/properties-view.cpp +++ b/obs/properties-view.cpp @@ -281,7 +281,7 @@ QWidget *OBSPropertiesView::AddList(obs_property_t prop, bool &warning) if (idx != -1) combo->setCurrentIndex(idx); - if (obs_data_has_autoselect(settings, name)) { + if (obs_data_has_autoselect_value(settings, name)) { string autoselect = from_obs_data_autoselect(settings, name, format); int id = combo->findData(QT_UTF8(autoselect.c_str())); diff --git a/plugins/mac-avcapture/av-capture.m b/plugins/mac-avcapture/av-capture.m index f39a785b5..59544f74f 100644 --- a/plugins/mac-avcapture/av-capture.m +++ b/plugins/mac-avcapture/av-capture.m @@ -707,7 +707,7 @@ static bool autoselect_preset(AVCaptureDevice *dev, obs_data_t settings) { NSString *preset = get_string(settings, "preset"); if (!dev || [dev supportsAVCaptureSessionPreset:preset]) { - if (obs_data_has_autoselect(settings, "preset")) { + if (obs_data_has_autoselect_value(settings, "preset")) { obs_data_unset_autoselect_value(settings, "preset"); return true; } diff --git a/plugins/win-dshow/win-dshow.cpp b/plugins/win-dshow/win-dshow.cpp index 8eb7d63f7..5e39ddaa3 100644 --- a/plugins/win-dshow/win-dshow.cpp +++ b/plugins/win-dshow/win-dshow.cpp @@ -348,7 +348,7 @@ static bool DetermineResolution(int &cx, int &cy, obs_data_t settings, VideoDevice dev) { const char *res = obs_data_get_autoselect_string(settings, RESOLUTION); - if (obs_data_has_autoselect(settings, RESOLUTION) && + if (obs_data_has_autoselect_value(settings, RESOLUTION) && ConvertRes(cx, cy, res) && ResolutionAvailable(dev, cx, cy)) return true; @@ -394,11 +394,14 @@ void DShowInput::Update(obs_data_t settings) VideoFormat format = VideoFormat::Any; if (resType == ResType_Custom) { + bool has_autosel_val; string resolution = obs_data_get_string(settings, RESOLUTION); if (!ResolutionValid(resolution, cx, cy)) return; - interval = obs_data_has_autoselect(settings, FRAME_INTERVAL) ? + has_autosel_val = obs_data_has_autoselect_value(settings, + FRAME_INTERVAL); + interval = has_autosel_val ? obs_data_get_autoselect_int(settings, FRAME_INTERVAL) : obs_data_get_int(settings, FRAME_INTERVAL);