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
90dc880e
Commit
90dc880e
authored
Nov 05, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/httpd: implement delay()
parent
e11ff967
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
NEWS
NEWS
+1
-1
httpd_output_plugin.c
src/output/httpd_output_plugin.c
+11
-2
No files found.
NEWS
View file @
90dc880e
...
@@ -65,7 +65,7 @@ ver 0.16 (20??/??/??)
...
@@ -65,7 +65,7 @@ ver 0.16 (20??/??/??)
- httpd: bind_to_address support (including IPv6)
- httpd: bind_to_address support (including IPv6)
- oss: 24 bit support via OSS4
- oss: 24 bit support via OSS4
- win32: new output plugin for Windows Wave
- win32: new output plugin for Windows Wave
- shout: more responsive to control commands
- shout
, httpd
: more responsive to control commands
- wildcards allowed in audio_format configuration
- wildcards allowed in audio_format configuration
- consistently lock audio output objects
- consistently lock audio output objects
* player:
* player:
...
...
src/output/httpd_output_plugin.c
View file @
90dc880e
...
@@ -375,6 +375,16 @@ httpd_output_send_header(struct httpd_output *httpd,
...
@@ -375,6 +375,16 @@ httpd_output_send_header(struct httpd_output *httpd,
httpd_client_send
(
client
,
httpd
->
header
);
httpd_client_send
(
client
,
httpd
->
header
);
}
}
static
unsigned
httpd_output_delay
(
void
*
data
)
{
struct
httpd_output
*
httpd
=
data
;
return
httpd
->
timer
->
started
?
timer_delay
(
httpd
->
timer
)
:
0
;
}
static
void
static
void
httpd_client_check_queue
(
gpointer
data
,
G_GNUC_UNUSED
gpointer
user_data
)
httpd_client_check_queue
(
gpointer
data
,
G_GNUC_UNUSED
gpointer
user_data
)
{
{
...
@@ -464,8 +474,6 @@ httpd_output_play(void *data, const void *chunk, size_t size, GError **error)
...
@@ -464,8 +474,6 @@ httpd_output_play(void *data, const void *chunk, size_t size, GError **error)
if
(
!
httpd
->
timer
->
started
)
if
(
!
httpd
->
timer
->
started
)
timer_start
(
httpd
->
timer
);
timer_start
(
httpd
->
timer
);
else
timer_sync
(
httpd
->
timer
);
timer_add
(
httpd
->
timer
,
size
);
timer_add
(
httpd
->
timer
,
size
);
return
size
;
return
size
;
...
@@ -575,6 +583,7 @@ const struct audio_output_plugin httpd_output_plugin = {
...
@@ -575,6 +583,7 @@ const struct audio_output_plugin httpd_output_plugin = {
.
disable
=
httpd_output_disable
,
.
disable
=
httpd_output_disable
,
.
open
=
httpd_output_open
,
.
open
=
httpd_output_open
,
.
close
=
httpd_output_close
,
.
close
=
httpd_output_close
,
.
delay
=
httpd_output_delay
,
.
send_tag
=
httpd_output_tag
,
.
send_tag
=
httpd_output_tag
,
.
play
=
httpd_output_play
,
.
play
=
httpd_output_play
,
.
pause
=
httpd_output_pause
,
.
pause
=
httpd_output_pause
,
...
...
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