jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(API Change) Rename autoselect/default functions

Browse Source 
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
This commit is contained in:
jp9000
2014-08-09 12:38:56 -07:00
parent 5780f3f177
commit 7608f77e8b
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/win-dshow/win-dshow.cpp
View File

@@ -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);