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

(API Change) Un-squish obs_sceneitem_* 

Renamed:                         To:
-----------------------------------------------------------
obs_sceneitem_getscene           obs_sceneitem_get_scene
obs_sceneitem_getsource          obs_sceneitem_get_source
obs_sceneitem_setpos             obs_sceneitem_set_pos
obs_sceneitem_setrot             obs_sceneitem_set_rot
obs_sceneitem_setscale           obs_sceneitem_set_scale
obs_sceneitem_setalignment       obs_sceneitem_set_alignment
obs_sceneitem_setorder           obs_sceneitem_set_order
obs_sceneitem_getpos             obs_sceneitem_get_pos
obs_sceneitem_getrot             obs_sceneitem_get_rot
obs_sceneitem_getscale           obs_sceneitem_get_scale
obs_sceneitem_getalignment       obs_sceneitem_get_alignment
master
jp9000 2014-08-03 14:39:19 -07:00
parent e42af67128
commit b007c6b139
6 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libobs/obs-scene.c
View File

@ -484,7 +484,7 @@ obs_scene_t obs_scene_fromsource(obs_source_t source)
return source->context.data;
}
obs_sceneitem_t obs_scene_findsource(obs_scene_t scene, const char *name)
obs_sceneitem_t obs_scene_find_source(obs_scene_t scene, const char *name)
{
struct obs_scene_item *item;
@ -643,12 +643,12 @@ void obs_sceneitem_remove(obs_sceneitem_t item)
obs_sceneitem_release(item);
}
obs_scene_t obs_sceneitem_getscene(obs_sceneitem_t item)
obs_scene_t obs_sceneitem_get_scene(obs_sceneitem_t item)
{
return item ? item->parent : NULL;
}
obs_source_t obs_sceneitem_getsource(obs_sceneitem_t item)
obs_source_t obs_sceneitem_get_source(obs_sceneitem_t item)
{
return item ? item->source : NULL;
}
@ -676,7 +676,7 @@ bool obs_sceneitem_selected(obs_sceneitem_t item)
return item ? item->selected : false;
}
void obs_sceneitem_setpos(obs_sceneitem_t item, const struct vec2 *pos)
void obs_sceneitem_set_pos(obs_sceneitem_t item, const struct vec2 *pos)
{
if (item) {
vec2_copy(&item->pos, pos);
@ -684,7 +684,7 @@ void obs_sceneitem_setpos(obs_sceneitem_t item, const struct vec2 *pos)
}
}
void obs_sceneitem_setrot(obs_sceneitem_t item, float rot)
void obs_sceneitem_set_rot(obs_sceneitem_t item, float rot)
{
if (item) {
item->rot = rot;
@ -692,7 +692,7 @@ void obs_sceneitem_setrot(obs_sceneitem_t item, float rot)
}
}
void obs_sceneitem_setscale(obs_sceneitem_t item, const struct vec2 *scale)
void obs_sceneitem_set_scale(obs_sceneitem_t item, const struct vec2 *scale)
{
if (item) {
vec2_copy(&item->scale, scale);
@ -700,7 +700,7 @@ void obs_sceneitem_setscale(obs_sceneitem_t item, const struct vec2 *scale)
}
}
void obs_sceneitem_setalignment(obs_sceneitem_t item, uint32_t alignment)
void obs_sceneitem_set_alignment(obs_sceneitem_t item, uint32_t alignment)
{
if (item) {
item->align = alignment;
@ -730,7 +730,7 @@ static inline void signal_move_dir(struct obs_scene_item *item,
calldata_free(&params);
}
void obs_sceneitem_setorder(obs_sceneitem_t item,
void obs_sceneitem_set_order(obs_sceneitem_t item,
enum obs_order_movement movement)
{
if (!item) return;
@ -799,24 +799,24 @@ void obs_sceneitem_set_bounds(obs_sceneitem_t item, const struct vec2 *bounds)
}
}
void obs_sceneitem_getpos(obs_sceneitem_t item, struct vec2 *pos)
void obs_sceneitem_get_pos(obs_sceneitem_t item, struct vec2 *pos)
{
if (item)
vec2_copy(pos, &item->pos);
}
float obs_sceneitem_getrot(obs_sceneitem_t item)
float obs_sceneitem_get_rot(obs_sceneitem_t item)
{
return item ? item->rot : 0.0f;
}
void obs_sceneitem_getscale(obs_sceneitem_t item, struct vec2 *scale)
void obs_sceneitem_get_scale(obs_sceneitem_t item, struct vec2 *scale)
{
if (item)
vec2_copy(scale, &item->scale);
}
uint32_t obs_sceneitem_getalignment(obs_sceneitem_t item)
uint32_t obs_sceneitem_get_alignment(obs_sceneitem_t item)
{
return item ? item->align : 0;
}

24
libobs/obs.h
View File

@ -776,7 +776,7 @@ EXPORT obs_source_t obs_scene_getsource(obs_scene_t scene);
EXPORT obs_scene_t obs_scene_fromsource(obs_source_t source);
/** Determines whether a source is within a scene */
EXPORT obs_sceneitem_t obs_scene_findsource(obs_scene_t scene,
EXPORT obs_sceneitem_t obs_scene_find_source(obs_scene_t scene,
const char *name);
/** Enumerates sources within a scene */
@ -794,22 +794,22 @@ EXPORT void obs_sceneitem_release(obs_sceneitem_t item);
EXPORT void obs_sceneitem_remove(obs_sceneitem_t item);
/** Gets the scene parent associated with the scene item. */
EXPORT obs_scene_t obs_sceneitem_getscene(obs_sceneitem_t item);
EXPORT obs_scene_t obs_sceneitem_get_scene(obs_sceneitem_t item);
/** Gets the source of a scene item. */
EXPORT obs_source_t obs_sceneitem_getsource(obs_sceneitem_t item);
EXPORT obs_source_t obs_sceneitem_get_source(obs_sceneitem_t item);
EXPORT void obs_sceneitem_select(obs_sceneitem_t item, bool select);
EXPORT bool obs_sceneitem_selected(obs_sceneitem_t item);
/* Functions for gettings/setting specific orientation of a scene item */
EXPORT void obs_sceneitem_setpos(obs_sceneitem_t item, const struct vec2 *pos);
EXPORT void obs_sceneitem_setrot(obs_sceneitem_t item, float rot_deg);
EXPORT void obs_sceneitem_setscale(obs_sceneitem_t item,
EXPORT void obs_sceneitem_set_pos(obs_sceneitem_t item, const struct vec2 *pos);
EXPORT void obs_sceneitem_set_rot(obs_sceneitem_t item, float rot_deg);
EXPORT void obs_sceneitem_set_scale(obs_sceneitem_t item,
const struct vec2 *scale);
EXPORT void obs_sceneitem_setalignment(obs_sceneitem_t item,
EXPORT void obs_sceneitem_set_alignment(obs_sceneitem_t item,
uint32_t alignment);
EXPORT void obs_sceneitem_setorder(obs_sceneitem_t item,
EXPORT void obs_sceneitem_set_order(obs_sceneitem_t item,
enum obs_order_movement movement);
EXPORT void obs_sceneitem_set_bounds_type(obs_sceneitem_t item,
@ -819,10 +819,10 @@ EXPORT void obs_sceneitem_set_bounds_alignment(obs_sceneitem_t item,
EXPORT void obs_sceneitem_set_bounds(obs_sceneitem_t item,
const struct vec2 *bounds);
EXPORT void obs_sceneitem_getpos(obs_sceneitem_t item, struct vec2 *pos);
EXPORT float obs_sceneitem_getrot(obs_sceneitem_t item);
EXPORT void obs_sceneitem_getscale(obs_sceneitem_t item, struct vec2 *scale);
EXPORT uint32_t obs_sceneitem_getalignment(obs_sceneitem_t item);
EXPORT void obs_sceneitem_get_pos(obs_sceneitem_t item, struct vec2 *pos);
EXPORT float obs_sceneitem_get_rot(obs_sceneitem_t item);
EXPORT void obs_sceneitem_get_scale(obs_sceneitem_t item, struct vec2 *scale);
EXPORT uint32_t obs_sceneitem_get_alignment(obs_sceneitem_t item);
EXPORT enum obs_bounds_type obs_sceneitem_get_bounds_type(obs_sceneitem_t item);
EXPORT uint32_t obs_sceneitem_get_bounds_alignment(obs_sceneitem_t item);

46
obs/window-basic-main.cpp
View File

@ -629,7 +629,7 @@ void OBSBasic::UpdateSources(OBSScene scene)
void OBSBasic::InsertSceneItem(obs_sceneitem_t item)
{
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
const char *name = obs_source_getname(source);
QListWidgetItem *listItem = new QListWidgetItem(QT_UTF8(name));
@ -699,8 +699,8 @@ void OBSBasic::RemoveScene(OBSSource source)
void OBSBasic::AddSceneItem(OBSSceneItem item)
{
obs_scene_t scene = obs_sceneitem_getscene(item);
obs_source_t source = obs_sceneitem_getsource(item);
obs_scene_t scene = obs_sceneitem_get_scene(item);
obs_source_t source = obs_sceneitem_get_source(item);
if (GetCurrentScene() == scene)
InsertSceneItem(item);
@ -710,7 +710,7 @@ void OBSBasic::AddSceneItem(OBSSceneItem item)
void OBSBasic::RemoveSceneItem(OBSSceneItem item)
{
obs_scene_t scene = obs_sceneitem_getscene(item);
obs_scene_t scene = obs_sceneitem_get_scene(item);
if (GetCurrentScene() == scene) {
for (int i = 0; i < ui->sources->count(); i++) {
@ -724,7 +724,7 @@ void OBSBasic::RemoveSceneItem(OBSSceneItem item)
}
}
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
int scenes = sourceSceneRefs[source] - 1;
sourceSceneRefs[source] = scenes;
@ -780,7 +780,7 @@ void OBSBasic::RenameSources(QString newName, QString prevName)
void OBSBasic::MoveSceneItem(OBSSceneItem item, obs_order_movement movement)
{
OBSScene scene = obs_sceneitem_getscene(item);
OBSScene scene = obs_sceneitem_get_scene(item);
if (scene != GetCurrentScene())
return;
@ -970,7 +970,7 @@ void OBSBasic::RemoveSelectedSceneItem()
{
OBSSceneItem item = GetCurrentSceneItem();
if (item) {
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
if (QueryRemoveSource(source))
obs_sceneitem_remove(item);
}
@ -1546,7 +1546,7 @@ void OBSBasic::on_sources_currentItemChanged(QListWidgetItem *current,
return;
OBSSceneItem item = current->data(Qt::UserRole).value<OBSSceneItem>();
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
if ((obs_source_get_output_flags(source) & OBS_SOURCE_VIDEO) == 0)
return;
@ -1660,7 +1660,7 @@ void OBSBasic::on_actionAddSource_triggered()
void OBSBasic::on_actionRemoveSource_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
if (source && QueryRemoveSource(source))
obs_sceneitem_remove(item);
@ -1669,7 +1669,7 @@ void OBSBasic::on_actionRemoveSource_triggered()
void OBSBasic::on_actionSourceProperties_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
OBSSource source = obs_sceneitem_getsource(item);
OBSSource source = obs_sceneitem_get_source(item);
if (source)
CreatePropertiesWindow(source);
@ -1678,37 +1678,37 @@ void OBSBasic::on_actionSourceProperties_triggered()
void OBSBasic::on_actionSourceUp_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_UP);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
}
void OBSBasic::on_actionSourceDown_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_DOWN);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
}
void OBSBasic::on_actionMoveUp_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_UP);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
}
void OBSBasic::on_actionMoveDown_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_DOWN);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
}
void OBSBasic::on_actionMoveToTop_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_TOP);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_TOP);
}
void OBSBasic::on_actionMoveToBottom_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
obs_sceneitem_setorder(item, OBS_ORDER_MOVE_BOTTOM);
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
}
static char *ReadLogFile(const char *log)
@ -1858,7 +1858,7 @@ void OBSBasic::SceneItemNameEdited(QWidget *editor,
if (!item)
return;
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
RenameListItem(ui->sources, source, text);
UNUSED_PARAMETER(endHint);
@ -2174,11 +2174,11 @@ static void SetItemTL(obs_sceneitem_t item, const vec3 &tl)
vec3 newTL;
vec2 pos;
obs_sceneitem_getpos(item, &pos);
obs_sceneitem_get_pos(item, &pos);
newTL = GetItemTL(item);
pos.x += tl.x - newTL.x;
pos.y += tl.y - newTL.y;
obs_sceneitem_setpos(item, &pos);
obs_sceneitem_set_pos(item, &pos);
}
static bool RotateSelectedSources(obs_scene_t scene, obs_sceneitem_t item,
@ -2191,10 +2191,10 @@ static bool RotateSelectedSources(obs_scene_t scene, obs_sceneitem_t item,
vec3 tl = GetItemTL(item);
rot += obs_sceneitem_getrot(item);
rot += obs_sceneitem_get_rot(item);
if (rot >= 360.0f) rot -= 360.0f;
else if (rot <= -360.0f) rot += 360.0f;
obs_sceneitem_setrot(item, rot);
obs_sceneitem_set_rot(item, rot);
SetItemTL(item, tl);
@ -2232,9 +2232,9 @@ static bool MultiplySelectedItemScale(obs_scene_t scene, obs_sceneitem_t item,
vec3 tl = GetItemTL(item);
vec2 scale;
obs_sceneitem_getscale(item, &scale);
obs_sceneitem_get_scale(item, &scale);
vec2_mul(&scale, &scale, &mul);
obs_sceneitem_setscale(item, &scale);
obs_sceneitem_set_scale(item, &scale);
SetItemTL(item, tl);

20
obs/window-basic-preview.cpp
View File

@ -51,7 +51,7 @@ struct SceneFindData {
static bool SceneItemHasVideo(obs_sceneitem_t item)
{
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
uint32_t flags = obs_source_get_output_flags(source);
return (flags & OBS_SOURCE_VIDEO) != 0;
}
@ -271,10 +271,10 @@ static vec2 GetItemSize(obs_sceneitem_t item)
if (boundsType != OBS_BOUNDS_NONE) {
obs_sceneitem_get_bounds(item, &size);
} else {
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
vec2 scale;
obs_sceneitem_getscale(item, &scale);
obs_sceneitem_get_scale(item, &scale);
size.x = float(obs_source_getwidth(source)) * scale.x;
size.y = float(obs_source_getheight(source)) * scale.y;
}
@ -304,7 +304,7 @@ void OBSBasicPreview::GetStretchHandleData(const vec2 &pos)
stretchItemSize = GetItemSize(stretchItem);
obs_sceneitem_get_box_transform(stretchItem, &boxTransform);
itemRot = obs_sceneitem_getrot(stretchItem);
itemRot = obs_sceneitem_get_rot(stretchItem);
vec3_from_vec4(&itemUL, &boxTransform.t);
/* build the item space conversion matrices */
@ -460,9 +460,9 @@ static bool move_items(obs_scene_t scene, obs_sceneitem_t item, void *param)
if (obs_sceneitem_selected(item)) {
vec2 pos;
obs_sceneitem_getpos(item, &pos);
obs_sceneitem_get_pos(item, &pos);
vec2_add(&pos, &pos, offset);
obs_sceneitem_setpos(item, &pos);
obs_sceneitem_set_pos(item, &pos);
}
UNUSED_PARAMETER(scene);
@ -489,7 +489,7 @@ void OBSBasicPreview::MoveItems(const vec2 &pos)
vec3 OBSBasicPreview::CalculateStretchPos(const vec3 &tl, const vec3 &br)
{
uint32_t alignment = obs_sceneitem_getalignment(stretchItem);
uint32_t alignment = obs_sceneitem_get_alignment(stretchItem);
vec3 pos;
vec3_zero(&pos);
@ -613,7 +613,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
if (!(modifiers & Qt::ControlModifier))
SnapStretchingToScreen(tl, br);
obs_source_t source = obs_sceneitem_getsource(stretchItem);
obs_source_t source = obs_sceneitem_get_source(stretchItem);
vec2 baseSize;
vec2_set(&baseSize,
@ -638,7 +638,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
ClampAspect(tl, br, size, baseSize);
vec2_div(&size, &size, &baseSize);
obs_sceneitem_setscale(stretchItem, &size);
obs_sceneitem_set_scale(stretchItem, &size);
}
pos3 = CalculateStretchPos(tl, br);
@ -646,7 +646,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
vec2 newPos;
vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y));
obs_sceneitem_setpos(stretchItem, &newPos);
obs_sceneitem_set_pos(stretchItem, &newPos);
}
void OBSBasicPreview::mouseMoveEvent(QMouseEvent *event)

6
obs/window-basic-transform.cpp
View File

@ -183,7 +183,7 @@ void OBSBasicTransform::RefreshControls()
obs_transform_info osi;
obs_sceneitem_get_info(item, &osi);
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
float width = float(obs_source_getwidth(source));
float height = float(obs_source_getheight(source));
@ -220,7 +220,7 @@ void OBSBasicTransform::OnBoundsType(int index)
if (!ignoreItemChange) {
obs_bounds_type lastType = obs_sceneitem_get_bounds_type(item);
if (lastType == OBS_BOUNDS_NONE) {
OBSSource source = obs_sceneitem_getsource(item);
OBSSource source = obs_sceneitem_get_source(item);
int width = (int)obs_source_getwidth(source);
int height = (int)obs_source_getheight(source);
@ -237,7 +237,7 @@ void OBSBasicTransform::OnControlChanged()
if (ignoreItemChange)
return;
obs_source_t source = obs_sceneitem_getsource(item);
obs_source_t source = obs_sceneitem_get_source(item);
double width = double(obs_source_getwidth(source));
double height = double(obs_source_getheight(source));

2
test/win/test.cpp
View File

@ -100,7 +100,7 @@ static void AddTestItems(obs_scene_t scene, obs_source_t source)
vec2_set(&scale, 20.0f, 20.0f);
item = obs_scene_add(scene, source);
obs_sceneitem_setscale(item, &scale);
obs_sceneitem_set_scale(item, &scale);
}
static HWND CreateTestWindow(HINSTANCE instance)