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
2c4b9981
You need to sign in or sign up before continuing.
Commit
2c4b9981
authored
Apr 08, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'release-0.17.4'
parents
8becbb8b
0a9c7ff6
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
13 deletions
+24
-13
.gitignore
.gitignore
+5
-2
Makefile.am
Makefile.am
+1
-1
NEWS
NEWS
+2
-0
configure.ac
configure.ac
+1
-1
PlayerCommands.cxx
src/PlayerCommands.cxx
+11
-7
PlayerControl.cxx
src/PlayerControl.cxx
+0
-2
PlayerThread.cxx
src/PlayerThread.cxx
+4
-0
No files found.
.gitignore
View file @
2c4b9981
*.Plo
*.Po
*.a
*.bz2
*.d
*.gz
*.la
*.lo
*.o
...
...
@@ -73,3 +71,8 @@ test/dump_text_file
test/test_byte_reverse
test/test_vorbis_encoder
test/DumpDatabase
/*.tar.gz
/*.tar.bz2
/*.tar.xz
/mpd-*/
Makefile.am
View file @
2c4b9981
ACLOCAL_AMFLAGS
=
-I
m4
AUTOMAKE_OPTIONS
=
foreign 1.11 dist-bzip2 subdir-objects
AUTOMAKE_OPTIONS
=
foreign 1.11 dist-bzip2
dist-xz
subdir-objects
AM_CPPFLAGS
+=
-I
$(srcdir)
/src
$(GLIB_CFLAGS)
...
...
NEWS
View file @
2c4b9981
...
...
@@ -18,8 +18,10 @@ ver 0.18 (2012/??/??)
ver 0.17.4 (2013/??/??)
* protocol:
- allow to omit END in ranges (START:END)
- don't emit IDLE_PLAYER before audio format is known
* decoder:
- ffmpeg: support float planar audio (ffmpeg 1.1)
- ffmpeg: fix AVFrame allocation
* player:
- implement missing "idle" events on output errors
* clock: fix build failure
...
...
configure.ac
View file @
2c4b9981
...
...
@@ -8,7 +8,7 @@ VERSION_REVISION=0
VERSION_EXTRA=0
AC_CONFIG_SRCDIR([src/Main.cxx])
AM_INIT_AUTOMAKE([foreign 1.11 dist-bzip2 subdir-objects])
AM_INIT_AUTOMAKE([foreign 1.11 dist-bzip2
dist-xz
subdir-objects])
AM_SILENT_RULES
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
...
...
src/PlayerCommands.cxx
View file @
2c4b9981
...
...
@@ -169,19 +169,23 @@ handle_status(Client *client,
}
if
(
player_status
.
state
!=
PLAYER_STATE_STOP
)
{
struct
audio_format_string
af_string
;
client_printf
(
client
,
COMMAND_STATUS_TIME
": %i:%i
\n
"
"elapsed: %1.3f
\n
"
COMMAND_STATUS_BITRATE
": %u
\n
"
COMMAND_STATUS_AUDIO
": %s
\n
"
,
COMMAND_STATUS_BITRATE
": %u
\n
"
,
(
int
)(
player_status
.
elapsed_time
+
0.5
),
(
int
)(
player_status
.
total_time
+
0.5
),
player_status
.
elapsed_time
,
player_status
.
bit_rate
,
audio_format_to_string
(
&
player_status
.
audio_format
,
&
af_string
));
player_status
.
bit_rate
);
if
(
audio_format_defined
(
&
player_status
.
audio_format
))
{
struct
audio_format_string
af_string
;
client_printf
(
client
,
COMMAND_STATUS_AUDIO
": %s
\n
"
,
audio_format_to_string
(
&
player_status
.
audio_format
,
&
af_string
));
}
}
if
((
updateJobId
=
isUpdatingDB
()))
{
...
...
src/PlayerControl.cxx
View file @
2c4b9981
...
...
@@ -104,8 +104,6 @@ player_control::Play(struct song *song)
assert
(
next_song
==
nullptr
);
Unlock
();
idle_add
(
IDLE_PLAYER
);
}
void
...
...
src/PlayerThread.cxx
View file @
2c4b9981
...
...
@@ -335,6 +335,8 @@ player_open_output(struct player *player)
pc
->
state
=
PLAYER_STATE_PLAY
;
pc
->
Unlock
();
idle_add
(
IDLE_PLAYER
);
return
true
;
}
else
{
g_warning
(
"%s"
,
error
->
message
);
...
...
@@ -399,6 +401,8 @@ player_check_decoder_startup(struct player *player)
pc
->
audio_format
=
dc
->
in_audio_format
;
pc
->
Unlock
();
idle_add
(
IDLE_PLAYER
);
player
->
play_audio_format
=
dc
->
out_audio_format
;
player
->
decoder_starting
=
false
;
...
...
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