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
9d6651d8
Commit
9d6651d8
authored
Oct 24, 2008
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jack: fix indentation
Indent with tabs.
parent
8b4829c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
33 deletions
+33
-33
audioOutput_jack.c
src/audioOutputs/audioOutput_jack.c
+33
-33
No files found.
src/audioOutputs/audioOutput_jack.c
View file @
9d6651d8
...
@@ -138,35 +138,35 @@ static int process(jack_nframes_t nframes, void *arg)
...
@@ -138,35 +138,35 @@ static int process(jack_nframes_t nframes, void *arg)
jack_default_audio_sample_t
*
out
[
2
];
jack_default_audio_sample_t
*
out
[
2
];
size_t
avail_data
,
avail_frames
;
size_t
avail_data
,
avail_frames
;
if
(
nframes
<=
0
)
if
(
nframes
<=
0
)
return
0
;
return
0
;
out
[
0
]
=
jack_port_get_buffer
(
jd
->
ports
[
0
],
nframes
);
out
[
0
]
=
jack_port_get_buffer
(
jd
->
ports
[
0
],
nframes
);
out
[
1
]
=
jack_port_get_buffer
(
jd
->
ports
[
1
],
nframes
);
out
[
1
]
=
jack_port_get_buffer
(
jd
->
ports
[
1
],
nframes
);
while
(
nframes
)
{
while
(
nframes
)
{
avail_data
=
jack_ringbuffer_read_space
(
jd
->
ringbuffer
[
1
]);
avail_data
=
jack_ringbuffer_read_space
(
jd
->
ringbuffer
[
1
]);
if
(
avail_data
>
0
)
{
if
(
avail_data
>
0
)
{
avail_frames
=
avail_data
/
sample_size
;
avail_frames
=
avail_data
/
sample_size
;
if
(
avail_frames
>
nframes
)
{
if
(
avail_frames
>
nframes
)
{
avail_frames
=
nframes
;
avail_frames
=
nframes
;
avail_data
=
nframes
*
sample_size
;
avail_data
=
nframes
*
sample_size
;
}
}
jack_ringbuffer_read
(
jd
->
ringbuffer
[
0
],
(
char
*
)
out
[
0
],
jack_ringbuffer_read
(
jd
->
ringbuffer
[
0
],
(
char
*
)
out
[
0
],
avail_data
);
avail_data
);
jack_ringbuffer_read
(
jd
->
ringbuffer
[
1
],
(
char
*
)
out
[
1
],
jack_ringbuffer_read
(
jd
->
ringbuffer
[
1
],
(
char
*
)
out
[
1
],
avail_data
);
avail_data
);
nframes
-=
avail_frames
;
nframes
-=
avail_frames
;
out
[
0
]
+=
avail_data
;
out
[
0
]
+=
avail_data
;
out
[
1
]
+=
avail_data
;
out
[
1
]
+=
avail_data
;
}
else
{
}
else
{
for
(
i
=
0
;
i
<
nframes
;
i
++
)
for
(
i
=
0
;
i
<
nframes
;
i
++
)
out
[
0
][
i
]
=
out
[
1
][
i
]
=
0
.
0
;
out
[
0
][
i
]
=
out
[
1
][
i
]
=
0
.
0
;
nframes
=
0
;
nframes
=
0
;
}
}
if
(
pthread_mutex_trylock
(
&
jd
->
play_audio_lock
)
==
0
)
{
if
(
pthread_mutex_trylock
(
&
jd
->
play_audio_lock
)
==
0
)
{
...
@@ -202,9 +202,10 @@ static void error_callback(const char *msg)
...
@@ -202,9 +202,10 @@ static void error_callback(const char *msg)
ERROR
(
"jack: %s
\n
"
,
msg
);
ERROR
(
"jack: %s
\n
"
,
msg
);
}
}
static
void
*
jack_initDriver
(
struct
audio_output
*
ao
,
static
void
*
mpd_unused
const
struct
audio_format
*
audio_format
,
jack_initDriver
(
struct
audio_output
*
ao
,
ConfigParam
*
param
)
mpd_unused
const
struct
audio_format
*
audio_format
,
ConfigParam
*
param
)
{
{
JackData
*
jd
;
JackData
*
jd
;
BlockParam
*
bp
;
BlockParam
*
bp
;
...
@@ -311,10 +312,9 @@ static int connect_jack(JackData *jd, struct audio_format *audio_format)
...
@@ -311,10 +312,9 @@ static int connect_jack(JackData *jd, struct audio_format *audio_format)
}
}
/* hay que buscar que hay */
/* hay que buscar que hay */
if
(
!
jd
->
output_ports
[
1
]
if
(
!
jd
->
output_ports
[
1
]
&&
&&
(
jports
=
jack_get_ports
(
jd
->
client
,
NULL
,
NULL
,
(
jports
=
jack_get_ports
(
jd
->
client
,
NULL
,
NULL
,
JackPortIsPhysical
|
JackPortIsPhysical
|
JackPortIsInput
)))
{
JackPortIsInput
))
)
{
jd
->
output_ports
[
0
]
=
jports
[
0
];
jd
->
output_ports
[
0
]
=
jports
[
0
];
jd
->
output_ports
[
1
]
=
jports
[
1
]
?
jports
[
1
]
:
jports
[
0
];
jd
->
output_ports
[
1
]
=
jports
[
1
]
?
jports
[
1
]
:
jports
[
0
];
DEBUG
(
"output_ports: %s %s
\n
"
,
DEBUG
(
"output_ports: %s %s
\n
"
,
...
@@ -394,23 +394,21 @@ static int jack_playAudio(void *data,
...
@@ -394,23 +394,21 @@ static int jack_playAudio(void *data,
/*DEBUG("jack_playAudio: (pid=%d)!\n", getpid());*/
/*DEBUG("jack_playAudio: (pid=%d)!\n", getpid());*/
if
(
jd
->
shutdown
)
{
if
(
jd
->
shutdown
)
{
ERROR
(
"Refusing to play, because there is no client thread.
\n
"
);
ERROR
(
"Refusing to play, because there is no client thread.
\n
"
);
freeJackClient
(
jd
);
freeJackClient
(
jd
);
audio_output_closed
(
jd
->
ao
);
audio_output_closed
(
jd
->
ao
);
return
0
;
return
0
;
}
}
while
(
samples
&&
!
jd
->
shutdown
)
{
while
(
samples
&&
!
jd
->
shutdown
)
{
space
=
jack_ringbuffer_write_space
(
jd
->
ringbuffer
[
0
]);
if
(
(
space
=
jack_ringbuffer_write_space
(
jd
->
ringbuffer
[
0
]))
if
(
space
>=
samples
*
sample_size
)
{
>=
samples
*
sample_size
)
{
/*space = MIN(space, samples*sample_size);*/
/*space = MIN(space, samples*sample_size);*/
/*space = samples*sample_size;*/
/*space = samples*sample_size;*/
/*for(i=0; i<space/sample_size; i++) {*/
/*for(i=0; i<space/sample_size; i++) {*/
for
(
i
=
0
;
i
<
samples
;
i
++
)
{
for
(
i
=
0
;
i
<
samples
;
i
++
)
{
sample
=
(
jack_default_audio_sample_t
)
*
(
buffer
++
)
/
32768
.
0
;
sample
=
(
jack_default_audio_sample_t
)
*
(
buffer
++
)
/
32768
.
0
;
jack_ringbuffer_write
(
jd
->
ringbuffer
[
0
],
(
void
*
)
&
sample
,
jack_ringbuffer_write
(
jd
->
ringbuffer
[
0
],
(
void
*
)
&
sample
,
...
@@ -423,9 +421,10 @@ static int jack_playAudio(void *data,
...
@@ -423,9 +421,10 @@ static int jack_playAudio(void *data,
/*samples--;*/
/*samples--;*/
}
}
samples
=
0
;
}
else
{
samples
=
0
;
}
else
{
pthread_mutex_lock
(
&
jd
->
play_audio_lock
);
pthread_mutex_lock
(
&
jd
->
play_audio_lock
);
pthread_cond_wait
(
&
jd
->
play_audio
,
pthread_cond_wait
(
&
jd
->
play_audio
,
&
jd
->
play_audio_lock
);
&
jd
->
play_audio_lock
);
...
@@ -433,6 +432,7 @@ static int jack_playAudio(void *data,
...
@@ -433,6 +432,7 @@ static int jack_playAudio(void *data,
}
}
}
}
return
0
;
return
0
;
}
}
...
...
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