Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
86f6233f
Commit
86f6233f
authored
Jan 18, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jack: use audio_output_get_name()
Determine the audio output name with audio_output_get_name() instead of obtaining the name from the configuration again.
parent
70c6cc33
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
jack_plugin.c
src/output/jack_plugin.c
+1
-11
No files found.
src/output/jack_plugin.c
View file @
86f6233f
...
@@ -40,7 +40,6 @@ struct jack_data {
...
@@ -40,7 +40,6 @@ struct jack_data {
struct
audio_output
*
ao
;
struct
audio_output
*
ao
;
/* configuration */
/* configuration */
char
*
name
;
char
*
output_ports
[
2
];
char
*
output_ports
[
2
];
int
ringbuffer_size
;
int
ringbuffer_size
;
...
@@ -58,7 +57,7 @@ struct jack_data {
...
@@ -58,7 +57,7 @@ struct jack_data {
static
const
char
*
static
const
char
*
mpd_jack_name
(
const
struct
jack_data
*
jd
)
mpd_jack_name
(
const
struct
jack_data
*
jd
)
{
{
return
jd
->
name
!=
NULL
?
jd
->
name
:
"mpd"
;
return
audio_output_get_name
(
jd
->
ao
)
;
}
}
static
struct
jack_data
*
static
struct
jack_data
*
...
@@ -100,8 +99,6 @@ mpd_jack_free(struct jack_data *jd)
...
@@ -100,8 +99,6 @@ mpd_jack_free(struct jack_data *jd)
mpd_jack_client_free
(
jd
);
mpd_jack_client_free
(
jd
);
g_free
(
jd
->
name
);
for
(
unsigned
i
=
0
;
i
<
G_N_ELEMENTS
(
jd
->
output_ports
);
++
i
)
for
(
unsigned
i
=
0
;
i
<
G_N_ELEMENTS
(
jd
->
output_ports
);
++
i
)
g_free
(
jd
->
output_ports
[
i
]);
g_free
(
jd
->
output_ports
[
i
]);
...
@@ -239,13 +236,6 @@ mpd_jack_init(struct audio_output *ao,
...
@@ -239,13 +236,6 @@ mpd_jack_init(struct audio_output *ao,
}
}
}
}
if
(
(
bp
=
getBlockParam
(
param
,
"name"
))
&&
(
strcmp
(
bp
->
value
,
"mpd"
)
!=
0
)
)
{
jd
->
name
=
g_strdup
(
bp
->
value
);
g_debug
(
"name=%s"
,
jd
->
name
);
}
else
jd
->
name
=
NULL
;
return
jd
;
return
jd
;
}
}
...
...
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