client.h   client.h 
skipping to change at line 70 skipping to change at line 70
#include <mpd/player.h> #include <mpd/player.h>
#include <mpd/playlist.h> #include <mpd/playlist.h>
#include <mpd/queue.h> #include <mpd/queue.h>
#include <mpd/recv.h> #include <mpd/recv.h>
#include <mpd/response.h> #include <mpd/response.h>
#include <mpd/search.h> #include <mpd/search.h>
#include <mpd/send.h> #include <mpd/send.h>
#include <mpd/song.h> #include <mpd/song.h>
#include <mpd/stats.h> #include <mpd/stats.h>
#include <mpd/status.h> #include <mpd/status.h>
#include <mpd/sticker.h>
#include <mpd/version.h>
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 parser.h   parser.h 
skipping to change at line 63 skipping to change at line 63
MPD_PARSER_ERROR, MPD_PARSER_ERROR,
/** /**
* MPD has returned a name-value pair. Call * MPD has returned a name-value pair. Call
* mpd_parser_get_name() and mpd_parser_get_value(). * mpd_parser_get_name() and mpd_parser_get_value().
*/ */
MPD_PARSER_PAIR, MPD_PARSER_PAIR,
}; };
/** /**
* \struct mpd_parser
*
* This opaque object is a low-level parser for the MPD protocol. You * This opaque object is a low-level parser for the MPD protocol. You
* feed it with input lines, and it provides parsed representations. * feed it with input lines, and it provides parsed representations.
*/ */
struct mpd_parser; struct mpd_parser;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
skipping to change at line 97 skipping to change at line 99
* Feeds a line (without the trailing newline character) received from * Feeds a line (without the trailing newline character) received from
* MPD / mpd_async_recv_line() into the parser. * MPD / mpd_async_recv_line() into the parser.
* *
* Note that the line parameter is writable, because the parser will * Note that the line parameter is writable, because the parser will
* modify it. The functions mpd_parser_get_name() and * modify it. The functions mpd_parser_get_name() and
* mpd_parser_get_value() will return pointers inside this buffer. * mpd_parser_get_value() will return pointers inside this buffer.
* This means that after passing the line to this function, you must * This means that after passing the line to this function, you must
* not modify or free it, until the name and value pointers are not * not modify or free it, until the name and value pointers are not
* used anymore. * used anymore.
* *
* @param parser the parser object * @param parser the #mpd_parser object
* @param line a line received from the MPD server * @param line a line received from the MPD server
* @return a result code indicating the type of line, or error * @return a result code indicating the type of line, or error
*/ */
enum mpd_parser_result enum mpd_parser_result
mpd_parser_feed(struct mpd_parser *parser, char *line); mpd_parser_feed(struct mpd_parser *parser, char *line);
/** /**
* Call this when mpd_parser_feed() has returned #MPD_PARSER_SUCCESS * Call this when mpd_parser_feed() has returned #MPD_PARSER_SUCCESS
* to find out whether this is an "OK" (false) or a "list_OK" (true) * to find out whether this is an "OK" (false) or a "list_OK" (true)
* response. * response.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
bool bool
mpd_parser_is_discrete(const struct mpd_parser *parser); mpd_parser_is_discrete(const struct mpd_parser *parser);
/** /**
* Call this when mpd_parser_feed() has returned #MPD_PARSER_ERROR to * Call this when mpd_parser_feed() has returned #MPD_PARSER_ERROR to
* obtain the reason for the error. * obtain the reason for the error.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
enum mpd_server_error enum mpd_server_error
mpd_parser_get_server_error(const struct mpd_parser *parser); mpd_parser_get_server_error(const struct mpd_parser *parser);
/** /**
* On #MPD_PARSER_ERROR, this returns the number of the list command * On #MPD_PARSER_ERROR, this returns the number of the list command
* which failed. Don't call this outside of a command list. * which failed. Don't call this outside of a command list.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
unsigned unsigned
mpd_parser_get_at(const struct mpd_parser *parser); mpd_parser_get_at(const struct mpd_parser *parser);
/** /**
* On #MPD_PARSER_ERROR, this returns the human readable error message * On #MPD_PARSER_ERROR, this returns the human readable error message
* returned by MPD (UTF-8). * returned by MPD (UTF-8).
* *
* This returns a pointer into the line buffer passed to * This returns a pointer into the line buffer passed to
* mpd_parser_feed(). It is valid as long as the buffer is not * mpd_parser_feed(). It is valid as long as the buffer is not
* freed/modified. * freed/modified.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
const char * const char *
mpd_parser_get_message(const struct mpd_parser *parser); mpd_parser_get_message(const struct mpd_parser *parser);
/** /**
* On #MPD_PARSER_PAIR, this returns the name. * On #MPD_PARSER_PAIR, this returns the name.
* *
* This returns a pointer into the line buffer passed to * This returns a pointer into the line buffer passed to
* mpd_parser_feed(). It is valid as long as the buffer is not * mpd_parser_feed(). It is valid as long as the buffer is not
* freed/modified. * freed/modified.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
const char * const char *
mpd_parser_get_name(const struct mpd_parser *parser); mpd_parser_get_name(const struct mpd_parser *parser);
/** /**
* On #MPD_PARSER_PAIR, this returns the value. * On #MPD_PARSER_PAIR, this returns the value.
* *
* This returns a pointer into the line buffer passed to * This returns a pointer into the line buffer passed to
* mpd_parser_feed(). It is valid as long as the buffer is not * mpd_parser_feed(). It is valid as long as the buffer is not
* freed/modified. * freed/modified.
* *
* @param parser the parser object * @param parser the #mpd_parser object
*/ */
mpd_pure mpd_pure
const char * const char *
mpd_parser_get_value(const struct mpd_parser *parser); mpd_parser_get_value(const struct mpd_parser *parser);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 8 change blocks. 
7 lines changed or deleted 9 lines changed or added


 status.h   status.h 
skipping to change at line 220 skipping to change at line 220
/** /**
* Returns time in seconds that have elapsed in the currently playing/pause d * Returns time in seconds that have elapsed in the currently playing/pause d
* song * song
*/ */
mpd_pure mpd_pure
unsigned unsigned
mpd_status_get_elapsed_time(const struct mpd_status *status); mpd_status_get_elapsed_time(const struct mpd_status *status);
/** /**
* Returns time in milliseconds that have elapsed in the currently
* playing/paused song.
*/
mpd_pure
unsigned
mpd_status_get_elapsed_ms(const struct mpd_status *status);
/**
* Returns the length in seconds of the currently playing/paused song * Returns the length in seconds of the currently playing/paused song
*/ */
mpd_pure mpd_pure
unsigned unsigned
mpd_status_get_total_time(const struct mpd_status *status); mpd_status_get_total_time(const struct mpd_status *status);
/** /**
* Returns current bit rate in kbps. 0 means unknown. * Returns current bit rate in kbps. 0 means unknown.
*/ */
mpd_pure mpd_pure
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 tag.h   tag.h 
skipping to change at line 65 skipping to change at line 65
MPD_TAG_DISC, MPD_TAG_DISC,
MPD_TAG_MUSICBRAINZ_ARTISTID, MPD_TAG_MUSICBRAINZ_ARTISTID,
MPD_TAG_MUSICBRAINZ_ALBUMID, MPD_TAG_MUSICBRAINZ_ALBUMID,
MPD_TAG_MUSICBRAINZ_ALBUMARTISTID, MPD_TAG_MUSICBRAINZ_ALBUMARTISTID,
MPD_TAG_MUSICBRAINZ_TRACKID, MPD_TAG_MUSICBRAINZ_TRACKID,
MPD_TAG_COUNT MPD_TAG_COUNT
}; };
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Looks up the name of the specified tag. * Looks up the name of the specified tag.
* *
* @return the name, or NULL if the tag type is not valid * @return the name, or NULL if the tag type is not valid
*/ */
const char * const char *
mpd_tag_name(enum mpd_tag_type type); mpd_tag_name(enum mpd_tag_type type);
/** /**
* Parses a tag name, and returns its #mpd_tag_type value. * Parses a tag name, and returns its #mpd_tag_type value.
skipping to change at line 91 skipping to change at line 95
/** /**
* Same as mpd_tag_name_parse(), but ignores case. * Same as mpd_tag_name_parse(), but ignores case.
* *
* @return a #mpd_tag_type value, or MPD_TAG_UNKNOWN if the name was * @return a #mpd_tag_type value, or MPD_TAG_UNKNOWN if the name was
* not recognized * not recognized
*/ */
enum mpd_tag_type enum mpd_tag_type
mpd_tag_name_iparse(const char *name); mpd_tag_name_iparse(const char *name);
#ifdef __cplusplus
}
#endif
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/