Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
a011caa4
Commit
a011caa4
authored
Sep 13, 2013
by
Guillaume Roguez
Browse files
#29564: video: rename Observator to Observer
parent
352db40f
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/video/video_base.h
View file @
a011caa4
...
@@ -57,7 +57,7 @@ enum VideoPixelFormat {
...
@@ -57,7 +57,7 @@ enum VideoPixelFormat {
namespace
sfl_video
{
namespace
sfl_video
{
template
<
typename
T
>
class
Observ
ato
r
;
template
<
typename
T
>
class
Observ
e
r
;
template
<
typename
T
>
class
Observable
;
template
<
typename
T
>
class
Observable
;
class
VideoFrame
;
class
VideoFrame
;
...
@@ -74,39 +74,39 @@ template <typename T>
...
@@ -74,39 +74,39 @@ template <typename T>
class
Observable
class
Observable
{
{
public:
public:
Observable
()
:
observ
ato
rs_
(),
mutex_
()
{}
Observable
()
:
observ
e
rs_
(),
mutex_
()
{}
virtual
~
Observable
()
{};
virtual
~
Observable
()
{};
void
attach
(
Observ
ato
r
<
T
>*
o
)
{
void
attach
(
Observ
e
r
<
T
>*
o
)
{
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
observ
ato
rs_
.
insert
(
o
);
observ
e
rs_
.
insert
(
o
);
}
}
void
detach
(
Observ
ato
r
<
T
>*
o
)
{
void
detach
(
Observ
e
r
<
T
>*
o
)
{
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
observ
ato
rs_
.
erase
(
o
);
observ
e
rs_
.
erase
(
o
);
}
}
void
notify
(
T
&
data
)
{
void
notify
(
T
&
data
)
{
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
std
::
unique_lock
<
std
::
mutex
>
lk
(
mutex_
);
for
(
auto
observ
ato
r
:
observ
ato
rs_
)
for
(
auto
observ
e
r
:
observ
e
rs_
)
observ
ato
r
->
update
(
this
,
data
);
observ
e
r
->
update
(
this
,
data
);
}
}
private:
private:
NON_COPYABLE
(
Observable
<
T
>
);
NON_COPYABLE
(
Observable
<
T
>
);
std
::
set
<
Observ
ato
r
<
T
>*>
observ
ato
rs_
;
std
::
set
<
Observ
e
r
<
T
>*>
observ
e
rs_
;
std
::
mutex
mutex_
;
// lock observ
ato
rs_
std
::
mutex
mutex_
;
// lock observ
e
rs_
};
};
/*=== Observ
ato
r =============================================================*/
/*=== Observ
e
r =============================================================*/
template
<
typename
T
>
template
<
typename
T
>
class
Observ
ato
r
class
Observ
e
r
{
{
public:
public:
virtual
~
Observ
ato
r
()
{};
virtual
~
Observ
e
r
()
{};
virtual
void
update
(
Observable
<
T
>*
,
T
&
)
=
0
;
virtual
void
update
(
Observable
<
T
>*
,
T
&
)
=
0
;
};
};
...
@@ -196,7 +196,7 @@ class VideoFrameActiveWriter :
...
@@ -196,7 +196,7 @@ class VideoFrameActiveWriter :
{};
{};
class
VideoFramePassiveReader
:
class
VideoFramePassiveReader
:
public
Observ
ato
r
<
VideoFrameSP
>
,
public
Observ
e
r
<
VideoFrameSP
>
,
public
VideoNode
public
VideoNode
{};
{};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment