OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move enum obs_source_type to obs-source.h

Browse source
This commit is contained in:
jp9000 2014-02-12 12:57:51 -07:00
parent 05b936e527
commit 526f8d4b61
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libobs/obs-source.h
View file

@ -23,6 +23,14 @@
extern "C" {
#endif
enum obs_source_type {
OBS_SOURCE_TYPE_INPUT,
OBS_SOURCE_TYPE_FILTER,
OBS_SOURCE_TYPE_TRANSITION,
OBS_SOURCE_TYPE_SCENE = 0x80000000
};
/**
* @name Source output flags
*

17
libobs/obs.h
View file

@ -26,6 +26,11 @@
#include "callback/signal.h"
#include "callback/proc.h"
#include "obs-defs.h"
#include "obs-data.h"
#include "obs-ui.h"
#include "obs-properties.h"
/* opaque types */
struct obs_display;
struct obs_source;
@ -43,10 +48,6 @@ typedef struct obs_output *obs_output_t;
typedef struct obs_encoder *obs_encoder_t;
typedef struct obs_service *obs_service_t;
#include "obs-defs.h"
#include "obs-data.h"
#include "obs-ui.h"
#include "obs-properties.h"
#include "obs-source.h"
#include "obs-encoder.h"
#include "obs-output.h"
@ -67,14 +68,6 @@ extern "C" {
#define LIBOBS_API_VER ((LIBOBS_API_MAJOR_VER << 16) | \
LIBOBS_API_MINOR_VER)
enum obs_source_type {
OBS_SOURCE_TYPE_INPUT,
OBS_SOURCE_TYPE_FILTER,
OBS_SOURCE_TYPE_TRANSITION,
OBS_SOURCE_TYPE_SCENE
};
/* used for changing the order of items (for example, filters in a source,
* or items in a scene) */
enum order_movement {