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
9326ce53
Commit
9326ce53
authored
Aug 04, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'release-0.17.5'
parents
fcb7233b
d8217c36
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
44 additions
and
19 deletions
+44
-19
NEWS
NEWS
+11
-1
configure.ac
configure.ac
+5
-0
mpd.conf.5
doc/mpd.conf.5
+15
-15
PlaylistCommands.cxx
src/PlaylistCommands.cxx
+1
-1
PlaylistEdit.cxx
src/PlaylistEdit.cxx
+6
-1
SongUpdate.cxx
src/SongUpdate.cxx
+1
-1
FfmpegDecoderPlugin.cxx
src/decoder/FfmpegDecoderPlugin.cxx
+1
-0
MikmodDecoderPlugin.cxx
src/decoder/MikmodDecoderPlugin.cxx
+4
-0
No files found.
NEWS
View file @
9326ce53
...
...
@@ -20,7 +20,17 @@ ver 0.18 (2012/??/??)
* improved decoder/output error reporting
* eliminate timer wakeup on idle MPD
ver 0.17.4 (2013/??/??)
ver 0.17.5 (2013/08/04)
* protocol:
- fix "playlistadd" with URI
- fix "move" relative to current when there is no current song
* decoder:
- ffmpeg: support "application/flv"
- mikmod: adapt to libmikmod 3.2
* configure.ac:
- detect system "ar"
ver 0.17.4 (2013/04/08)
* protocol:
- allow to omit END in ranges (START:END)
- don't emit IDLE_PLAYER before audio format is known
...
...
configure.ac
View file @
9326ce53
...
...
@@ -23,6 +23,11 @@ AC_PROG_CC_C99
AC_PROG_CXX
AC_PROG_RANLIB
AN_MAKEVAR([AR], [AC_PROG_AR])
AN_PROGRAM([ar], [AC_PROG_AR])
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
AC_PROG_AR
AC_PROG_INSTALL
AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG
...
...
doc/mpd.conf.5
View file @
9326ce53
...
...
@@ -29,29 +29,18 @@ See \fBdocs/mpdconf.example\fP in the source tarball for an example
configuration file.
.SH REQUIRED PARAMETERS
.TP
.B follow_outside_symlinks <yes or no>
Control if MPD will follow symbolic links pointing outside the music dir.
You must recreate the database after changing this option.
The default is "yes".
.TP
.B follow_inside_symlinks <yes or no>
Control if MPD will follow symbolic links pointing inside the music dir,
potentially adding duplicates to the database.
You must recreate the database after changing this option.
The default is "yes".
.TP
.B db_file <file>
This specifies where the db file will be stored.
.TP
.B sticker_file <file>
The location of the sticker database. This is a database which
manages dynamic information attached to songs.
.TP
.B log_file <file>
This specifies where the log file should be located.
The special value "syslog" makes MPD use the local syslog daemon.
.SH OPTIONAL PARAMETERS
.TP
.B sticker_file <file>
The location of the sticker database. This is a database which
manages dynamic information attached to songs.
.TP
.B pid_file <file>
This specifies the file to save mpd's process ID in.
.TP
...
...
@@ -99,6 +88,17 @@ reports from what address a connection is opened, and when it is closed, and
"verbose" records excessive amounts of information for debugging purposes. The
default is "default".
.TP
.B follow_outside_symlinks <yes or no>
Control if MPD will follow symbolic links pointing outside the music dir.
You must recreate the database after changing this option.
The default is "yes".
.TP
.B follow_inside_symlinks <yes or no>
Control if MPD will follow symbolic links pointing inside the music dir,
potentially adding duplicates to the database.
You must recreate the database after changing this option.
The default is "yes".
.TP
.B zeroconf_enabled <yes or no>
If yes, and MPD has been compiled with support for Avahi or Bonjour, service
information will be published with Zeroconf. The default is yes.
...
...
src/PlaylistCommands.cxx
View file @
9326ce53
...
...
@@ -193,7 +193,7 @@ handle_playlistadd(Client *client, G_GNUC_UNUSED int argc, char *argv[])
return
COMMAND_RETURN_ERROR
;
}
success
=
spl_append_uri
(
argv
[
1
]
,
playlist
,
&
error
);
success
=
spl_append_uri
(
uri
,
playlist
,
&
error
);
}
else
success
=
search_add_to_playlist
(
uri
,
playlist
,
nullptr
,
&
error
);
...
...
src/PlaylistEdit.cxx
View file @
9326ce53
...
...
@@ -342,7 +342,12 @@ playlist::MoveRange(player_control &pc, unsigned start, unsigned end, int to)
* (-playlist.length == to) => move to position BEFORE current song
*/
const
int
currentSong
=
GetCurrentPosition
();
if
(
to
<
0
&&
currentSong
>=
0
)
{
if
(
to
<
0
)
{
if
(
currentSong
<
0
)
/* can't move relative to current song,
because there is no current song */
return
PLAYLIST_RESULT_BAD_RANGE
;
if
(
start
<=
(
unsigned
)
currentSong
&&
(
unsigned
)
currentSong
<
end
)
/* no-op, can't be moved to offset of itself */
return
PLAYLIST_RESULT_SUCCESS
;
...
...
src/SongUpdate.cxx
View file @
9326ce53
...
...
@@ -173,7 +173,7 @@ Song::UpdateFileInArchive()
if
(
suffix
==
NULL
)
return
false
;
plugin
=
decoder_plugin_from_suffix
(
suffix
,
nullptr
);
plugin
=
decoder_plugin_from_suffix
(
suffix
,
NULL
);
if
(
plugin
==
NULL
)
return
false
;
...
...
src/decoder/FfmpegDecoderPlugin.cxx
View file @
9326ce53
...
...
@@ -586,6 +586,7 @@ static const char *const ffmpeg_suffixes[] = {
};
static
const
char
*
const
ffmpeg_mime_types
[]
=
{
"application/flv"
,
"application/m4a"
,
"application/mp4"
,
"application/octet-stream"
,
...
...
src/decoder/MikmodDecoderPlugin.cxx
View file @
9326ce53
...
...
@@ -199,7 +199,11 @@ mikmod_decoder_scan_file(const char *path_fs,
if
(
title
!=
nullptr
)
{
tag_handler_invoke_tag
(
handler
,
handler_ctx
,
TAG_TITLE
,
title
);
#if (LIBMIKMOD_VERSION >= 0x030200)
MikMod_free
(
title
);
#else
free
(
title
);
#endif
}
return
true
;
...
...
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