Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gst-plugins-good
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
611
Issues
611
List
Boards
Labels
Service Desk
Milestones
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GStreamer
gst-plugins-good
Commits
92cfb335
Commit
92cfb335
authored
Dec 09, 2011
by
Nicolas Baron
Committed by
Tim-Philipp Müller
Dec 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jack: add "client-name" property to jackaudiosink and jackaudiosrc
https://bugzilla.gnome.org/show_bug.cgi?id=665872
parent
c363ae82
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
6 deletions
+48
-6
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosink.c
+23
-3
ext/jack/gstjackaudiosink.h
ext/jack/gstjackaudiosink.h
+1
-0
ext/jack/gstjackaudiosrc.c
ext/jack/gstjackaudiosrc.c
+23
-3
ext/jack/gstjackaudiosrc.h
ext/jack/gstjackaudiosrc.h
+1
-0
No files found.
ext/jack/gstjackaudiosink.c
View file @
92cfb335
...
...
@@ -329,7 +329,11 @@ gst_jack_ring_buffer_open_device (GstRingBuffer * buf)
GST_DEBUG_OBJECT
(
sink
,
"open"
);
if
(
sink
->
client_name
)
{
name
=
sink
->
client_name
;
}
else
{
name
=
g_get_application_name
();
}
if
(
!
name
)
name
=
"GStreamer"
;
...
...
@@ -646,6 +650,7 @@ enum
#define DEFAULT_PROP_CONNECT GST_JACK_CONNECT_AUTO
#define DEFAULT_PROP_SERVER NULL
#define DEFAULT_PROP_CLIENT_NAME NULL
enum
{
...
...
@@ -653,6 +658,7 @@ enum
PROP_CONNECT
,
PROP_SERVER
,
PROP_CLIENT
,
PROP_CLIENT_NAME
,
PROP_LAST
};
...
...
@@ -711,6 +717,12 @@ gst_jack_audio_sink_class_init (GstJackAudioSinkClass * klass)
"The Jack server to connect to (NULL = default)"
,
DEFAULT_PROP_SERVER
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
gobject_class
,
PROP_CLIENT_NAME
,
g_param_spec_string
(
"client-name"
,
"Client name"
,
"The client name of the Jack instance (NULL = default)"
,
DEFAULT_PROP_CLIENT_NAME
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
gobject_class
,
PROP_CLIENT
,
g_param_spec_boxed
(
"client"
,
"JackClient"
,
"Handle for jack client"
,
GST_TYPE_JACK_CLIENT
,
...
...
@@ -738,6 +750,7 @@ gst_jack_audio_sink_init (GstJackAudioSink * sink,
sink
->
jclient
=
NULL
;
sink
->
ports
=
NULL
;
sink
->
port_count
=
0
;
sink
->
client_name
=
g_strdup
(
DEFAULT_PROP_CLIENT_NAME
);
sink
->
buffers
=
NULL
;
}
...
...
@@ -759,6 +772,10 @@ gst_jack_audio_sink_set_property (GObject * object, guint prop_id,
sink
=
GST_JACK_AUDIO_SINK
(
object
);
switch
(
prop_id
)
{
case
PROP_CLIENT_NAME
:
g_free
(
sink
->
client_name
);
sink
->
client_name
=
g_value_dup_string
(
value
);
break
;
case
PROP_CONNECT
:
sink
->
connect
=
g_value_get_enum
(
value
);
break
;
...
...
@@ -787,6 +804,9 @@ gst_jack_audio_sink_get_property (GObject * object, guint prop_id,
sink
=
GST_JACK_AUDIO_SINK
(
object
);
switch
(
prop_id
)
{
case
PROP_CLIENT_NAME
:
g_value_set_string
(
value
,
sink
->
client_name
);
break
;
case
PROP_CONNECT
:
g_value_set_enum
(
value
,
sink
->
connect
);
break
;
...
...
ext/jack/gstjackaudiosink.h
View file @
92cfb335
...
...
@@ -58,6 +58,7 @@ struct _GstJackAudioSink {
GstJackConnect
connect
;
gchar
*
server
;
jack_client_t
*
jclient
;
gchar
*
client_name
;
/* our client */
GstJackAudioClient
*
client
;
...
...
ext/jack/gstjackaudiosrc.c
View file @
92cfb335
...
...
@@ -336,7 +336,11 @@ gst_jack_ring_buffer_open_device (GstRingBuffer * buf)
GST_DEBUG_OBJECT
(
src
,
"open"
);
if
(
src
->
client_name
)
{
name
=
src
->
client_name
;
}
else
{
name
=
g_get_application_name
();
}
if
(
!
name
)
name
=
"GStreamer"
;
...
...
@@ -649,6 +653,7 @@ enum
#define DEFAULT_PROP_CONNECT GST_JACK_CONNECT_AUTO
#define DEFAULT_PROP_SERVER NULL
#define DEFAULT_PROP_CLIENT_NAME NULL
enum
{
...
...
@@ -656,6 +661,7 @@ enum
PROP_CONNECT
,
PROP_SERVER
,
PROP_CLIENT
,
PROP_CLIENT_NAME
,
PROP_LAST
};
...
...
@@ -731,6 +737,12 @@ gst_jack_audio_src_class_init (GstJackAudioSrcClass * klass)
"The Jack server to connect to (NULL = default)"
,
DEFAULT_PROP_SERVER
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
gobject_class
,
PROP_CLIENT_NAME
,
g_param_spec_string
(
"client-name"
,
"Client name"
,
"The client name of the Jack instance (NULL = default)"
,
DEFAULT_PROP_CLIENT_NAME
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
gobject_class
,
PROP_CLIENT
,
g_param_spec_boxed
(
"client"
,
"JackClient"
,
"Handle for jack client"
,
GST_TYPE_JACK_CLIENT
,
...
...
@@ -763,6 +775,7 @@ gst_jack_audio_src_init (GstJackAudioSrc * src, GstJackAudioSrcClass * gclass)
src
->
ports
=
NULL
;
src
->
port_count
=
0
;
src
->
buffers
=
NULL
;
src
->
client_name
=
g_strdup
(
DEFAULT_PROP_CLIENT_NAME
);
}
static
void
...
...
@@ -781,6 +794,10 @@ gst_jack_audio_src_set_property (GObject * object, guint prop_id,
GstJackAudioSrc
*
src
=
GST_JACK_AUDIO_SRC
(
object
);
switch
(
prop_id
)
{
case
PROP_CLIENT_NAME
:
g_free
(
src
->
client_name
);
src
->
client_name
=
g_value_dup_string
(
value
);
break
;
case
PROP_CONNECT
:
src
->
connect
=
g_value_get_enum
(
value
);
break
;
...
...
@@ -807,6 +824,9 @@ gst_jack_audio_src_get_property (GObject * object, guint prop_id,
GstJackAudioSrc
*
src
=
GST_JACK_AUDIO_SRC
(
object
);
switch
(
prop_id
)
{
case
PROP_CLIENT_NAME
:
g_value_set_string
(
value
,
src
->
client_name
);
break
;
case
PROP_CONNECT
:
g_value_set_enum
(
value
,
src
->
connect
);
break
;
...
...
ext/jack/gstjackaudiosrc.h
View file @
92cfb335
...
...
@@ -75,6 +75,7 @@ struct _GstJackAudioSrc
GstJackConnect
connect
;
gchar
*
server
;
jack_client_t
*
jclient
;
gchar
*
client_name
;
/* our client */
GstJackAudioClient
*
client
;
...
...
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