Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
obs-studio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yunxiang Li
obs-studio
Commits
9c4024f5
Commit
9c4024f5
authored
10 years ago
by
Palana
Browse files
Options
Downloads
Patches
Plain Diff
Implement 'update_properties' for mac-avcapture
parent
59f2a6ac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/mac-avcapture/av-capture.m
+20
-6
20 additions, 6 deletions
plugins/mac-avcapture/av-capture.m
with
20 additions
and
6 deletions
plugins/mac-avcapture/av-capture.m
+
20
−
6
View file @
9c4024f5
...
...
@@ -453,12 +453,9 @@ error_input:
AVFREE
(
capture
->
device
);
}
static
inline
void
handle_disconnect
(
struct
av_capture
*
capture
,
static
inline
void
handle_disconnect
_capture
(
struct
av_capture
*
capture
,
AVCaptureDevice
*
dev
)
{
if
(
!
dev
)
return
;
if
(
!
[
dev
.
uniqueID
isEqualTo
:
capture
->
uid
])
return
;
...
...
@@ -474,12 +471,19 @@ static inline void handle_disconnect(struct av_capture* capture,
remove_device
(
capture
);
}
static
inline
void
handle_connect
(
struct
av_capture
*
capture
,
AVCaptureDevice
*
dev
,
obs_data_t
*
settings
)
static
inline
void
handle_
dis
connect
(
struct
av_capture
*
capture
,
AVCaptureDevice
*
dev
)
{
if
(
!
dev
)
return
;
handle_disconnect_capture
(
capture
,
dev
);
obs_source_update_properties
(
capture
->
source
);
}
static
inline
void
handle_connect_capture
(
struct
av_capture
*
capture
,
AVCaptureDevice
*
dev
,
obs_data_t
*
settings
)
{
if
(
!
[
dev
.
uniqueID
isEqualTo
:
capture
->
uid
])
return
;
...
...
@@ -495,6 +499,16 @@ static inline void handle_connect(struct av_capture *capture,
capture_device
(
capture
,
[
dev
retain
],
settings
);
}
static
inline
void
handle_connect
(
struct
av_capture
*
capture
,
AVCaptureDevice
*
dev
,
obs_data_t
*
settings
)
{
if
(
!
dev
)
return
;
handle_connect_capture
(
capture
,
dev
,
settings
);
obs_source_update_properties
(
capture
->
source
);
}
static
void
av_capture_init
(
struct
av_capture
*
capture
,
obs_data_t
*
settings
)
{
if
(
!
init_session
(
capture
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment