libmpd-internal.h   libmpd-internal.h 
skipping to change at line 57 skipping to change at line 57
}MpdData_real; }MpdData_real;
/* queue struct */ /* queue struct */
typedef struct _MpdQueue MpdQueue; typedef struct _MpdQueue MpdQueue;
typedef struct _MpdServerState { typedef struct _MpdServerState {
/* information needed to detect changes on mpd's side */ /* information needed to detect changes on mpd's side */
long long playlistid; long long playlistid;
long long storedplaylistid; long long storedplaylistid;
int songid; int songid;
int songpos; int songpos;
int nextsongpos;
int nextsongid;
int state; int state;
unsigned long dbUpdateTime; unsigned long dbUpdateTime;
int updatingDb; int updatingDb;
int random; int random;
int repeat; int repeat;
int volume; int volume;
int xfade; int xfade;
int totaltime; int totaltime;
int elapsedtime; int elapsedtime;
int bitrate; int bitrate;
unsigned int samplerate; unsigned int samplerate;
int bits; int bits;
int channels; int channels;
unsigned long playlistLength; unsigned long playlistLength;
char error[512]; char error[512];
int single;
int consume;
} MpdServerState; } MpdServerState;
/* command struct */ /* command struct */
/* internal use only */ /* internal use only */
typedef struct _MpdCommand { typedef struct _MpdCommand {
char *command_name; char *command_name;
int enabled; int enabled;
} MpdCommand; } MpdCommand;
typedef struct _MpdObj { typedef struct _MpdObj {
skipping to change at line 141 skipping to change at line 145
*/ */
int search_type; int search_type;
int search_field; int search_field;
/** /**
* For tracking changed outputs. * For tracking changed outputs.
* A hack for retarted mpd * A hack for retarted mpd
*/ */
int num_outputs; int num_outputs;
int *output_states; int *output_states;
/**
* Supported url handlers
*/
char **url_handlers;
/** /**
* For testing supported tags * For testing supported tags
*/ */
int supported_tags[MPD_TAG_NUM_OF_ITEM_TYPES]; int supported_tags[MPD_TAG_NUM_OF_ITEM_TYPES];
int has_idle; int has_idle;
}_MpdObj; }_MpdObj;
typedef enum MpdQueueType { typedef enum MpdQueueType {
MPD_QUEUE_ADD, MPD_QUEUE_ADD,
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added


 libmpd-player.h   libmpd-player.h 
skipping to change at line 144 skipping to change at line 144
* \param mi a #MpdObj * \param mi a #MpdObj
* *
* Get the state of repeat: 1 if enabled, 0 when disabled. * Get the state of repeat: 1 if enabled, 0 when disabled.
* *
* @returns the state of repeat * @returns the state of repeat
*/ */
int mpd_player_get_repeat(MpdObj * mi); int mpd_player_get_repeat(MpdObj * mi);
/** /**
* \param mi a #MpdObj * \param mi a #MpdObj
*
* Get the state of consume mode: 1 if enabled, 0 when disabled.
*
* @returns the state of consume
*/
int mpd_player_get_consume(MpdObj * mi);
/**
* \param mi a #MpdObj
*
* Get the state of single mode: 1 if enabled, 0 when disabled.
*
* @returns the state of single
*/
int mpd_player_get_single(MpdObj * mi);
/**
* \param mi a #MpdObj
* \param repeat New state of repeat (1 is enabled, 0 is disabled) * \param repeat New state of repeat (1 is enabled, 0 is disabled)
* *
* Enable/disabled repeat * Enable/disabled repeat
* *
* @returns 0 when successful * @returns 0 when successful
*/ */
int mpd_player_set_repeat(MpdObj * mi, int repeat); int mpd_player_set_repeat(MpdObj * mi, int repeat);
/** /**
* \param mi a #MpdObj * \param mi a #MpdObj
* *
skipping to change at line 179 skipping to change at line 197
/** /**
* @param mi a #MpdObj * @param mi a #MpdObj
* @param sec Position to seek to. (in seconds) * @param sec Position to seek to. (in seconds)
* *
* Seek through the current song. * Seek through the current song.
* @returns a #MpdError * @returns a #MpdError
*/ */
int mpd_player_seek(MpdObj * mi, int sec); int mpd_player_seek(MpdObj * mi, int sec);
int mpd_player_get_next_song_pos(MpdObj *mi);
int mpd_player_get_next_song_id(MpdObj *mi);
/**
* @param mi a #MpdObj
* @param single the state of single mode
*
* Enable/disable single mode. (single = 1 is enabled, single = 0 disabled)
* @return a #MpdError
*/
int mpd_player_set_single(MpdObj * mi, int single);
/**
* @param mi a #MpdObj
* @param consume the state of consume mode
*
* Enable/disable consume mode. (consume = 1 is enabled, consume = 0 disabl
ed)
*/
int mpd_player_set_consume(MpdObj * mi, int consume);
#endif #endif
/*@}*/ /*@}*/
 End of changes. 2 change blocks. 
0 lines changed or deleted 38 lines changed or added


 libmpd-version.h   libmpd-version.h 
skipping to change at line 21 skipping to change at line 21
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef LIBMPD_VERSION #ifndef LIBMPD_VERSION
#define LIBMPD_VERSION "0.18.0" #define LIBMPD_VERSION "0.18.96"
#define LIBMPD_MAJOR_VERSION (0) #define LIBMPD_MAJOR_VERSION (0)
#define LIBMPD_MINOR_VERSION (18) #define LIBMPD_MINOR_VERSION (18)
#define LIBMPD_MICRO_VERSION (0) #define LIBMPD_MICRO_VERSION (96)
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 libmpd.h   libmpd.h 
skipping to change at line 360 skipping to change at line 360
MPD_CST_BITRATE = 0x4000, MPD_CST_BITRATE = 0x4000,
/** the audio format of the playing song changed.*/ /** the audio format of the playing song changed.*/
MPD_CST_AUDIOFORMAT = 0x8000, MPD_CST_AUDIOFORMAT = 0x8000,
/** the queue has changed */ /** the queue has changed */
MPD_CST_STORED_PLAYLIST = 0x20000, MPD_CST_STORED_PLAYLIST = 0x20000,
/** server error */ /** server error */
MPD_CST_SERVER_ERROR = 0x40000, MPD_CST_SERVER_ERROR = 0x40000,
/** output changed */ /** output changed */
MPD_CST_OUTPUT = 0x80000, MPD_CST_OUTPUT = 0x80000,
/** Sticker changed */ /** Sticker changed */
MPD_CST_STICKER = 0x100000 MPD_CST_STICKER = 0x100000,
/** Next song changed */
MPD_CST_NEXTSONG = 0x200000,
/** Single mode changed */
MPD_CST_SINGLE_MODE = 0x400000,
/** Consume mode changed */
MPD_CST_CONSUME_MODE = 0x800000
} ChangedStatusType; } ChangedStatusType;
/* callback typedef's */ /* callback typedef's */
/** /**
* @param mi a #MpdObj * @param mi a #MpdObj
* @param what a #ChangedStatusType that determines what changed triggered the signal. This is a bitmask. * @param what a #ChangedStatusType that determines what changed triggered the signal. This is a bitmask.
* @param userdata user data set when the signal handler was connected. * @param userdata user data set when the signal handler was connected.
* *
* Signal that gets called when the state of mpd has changed. Look #Changed StatusType to see the possible events. * Signal that gets called when the state of mpd has changed. Look #Changed StatusType to see the possible events.
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 7 lines changed or added


 libmpdclient.h   libmpdclient.h 
skipping to change at line 173 skipping to change at line 173
/* mpd_Status /* mpd_Status
* holds info return from status command * holds info return from status command
*/ */
typedef struct mpd_Status { typedef struct mpd_Status {
/* 0-100, or MPD_STATUS_NO_VOLUME when there is no volume support */ /* 0-100, or MPD_STATUS_NO_VOLUME when there is no volume support */
int volume; int volume;
/* 1 if repeat is on, 0 otherwise */ /* 1 if repeat is on, 0 otherwise */
int repeat; int repeat;
/* 1 if random is on, 0 otherwise */ /* 1 if random is on, 0 otherwise */
int random; int random;
/* 1 if single in on, 0 otherwise */
int single;
/* 1 if single is on, 0 otherwise */
int consume;
/* playlist length */ /* playlist length */
int playlistLength; int playlistLength;
/* playlist, use this to determine when the playlist has changed */ /* playlist, use this to determine when the playlist has changed */
long long playlist; long long playlist;
/* The id, used to determine is one of the playlists are changed */ /* The id, used to determine is one of the playlists are changed */
long long storedplaylist; long long storedplaylist;
/* use with MPD_STATUS_STATE_* to determine state of player */ /* use with MPD_STATUS_STATE_* to determine state of player */
int state; int state;
/* crossfade setting in seconds */ /* crossfade setting in seconds */
int crossfade; int crossfade;
/* if a song is currently selected (always the case when state is /* if a song is currently selected (always the case when state is
* PLAY or PAUSE), this is the position of the currently * PLAY or PAUSE), this is the position of the currently
* playing song in the playlist, beginning with 0 * playing song in the playlist, beginning with 0
*/ */
int song; int song;
/* Song ID of the currently selected song */ /* Song ID of the currently selected song */
int songid; int songid;
/* The next song pos */
int nextsong;
/* The next song id */
int nextsongid;
/* time in seconds that have elapsed in the currently playing/paused /* time in seconds that have elapsed in the currently playing/paused
* song * song
*/ */
int elapsedTime; int elapsedTime;
/* length in seconds of the currently playing/paused song */ /* length in seconds of the currently playing/paused song */
int totalTime; int totalTime;
/* current bit rate in kbs */ /* current bit rate in kbs */
int bitRate; int bitRate;
/* audio sample rate */ /* audio sample rate */
unsigned int sampleRate; unsigned int sampleRate;
skipping to change at line 290 skipping to change at line 300
char *performer; char *performer;
/* Disc */ /* Disc */
char *disc; char *disc;
/* Comment */ /* Comment */
char *comment; char *comment;
/* AlbumArtist */ /* AlbumArtist */
char *albumartist; char *albumartist;
/* length of song in seconds, check that it is not MPD_SONG_NO_TIME */ /* length of song in seconds, check that it is not MPD_SONG_NO_TIME */
int time; int time;
/* The modification time */
time_t mtime;
/* if plchanges/playlistinfo/playlistid used, is the position of the /* if plchanges/playlistinfo/playlistid used, is the position of the
* song in the playlist */ * song in the playlist */
int pos; int pos;
/* song id for a song in the playlist */ /* song id for a song in the playlist */
int id; int id;
} mpd_Song; } mpd_Song;
/* mpd_newSong /* mpd_newSong
* use to allocate memory for a new mpd_Song * use to allocate memory for a new mpd_Song
* file, artist, etc all initialized to NULL * file, artist, etc all initialized to NULL
skipping to change at line 510 skipping to change at line 522
void mpd_sendPrevCommand(mpd_Connection * connection); void mpd_sendPrevCommand(mpd_Connection * connection);
void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to); void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to);
void mpd_sendMoveIdCommand(mpd_Connection * connection, int from, int to); void mpd_sendMoveIdCommand(mpd_Connection * connection, int from, int to);
void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2) ; void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2) ;
void mpd_sendSwapIdCommand(mpd_Connection * connection, int song1, int song 2); void mpd_sendSwapIdCommand(mpd_Connection * connection, int song1, int song 2);
void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time); void mpd_sendSeekCommand(mpd_Connection * connection, int song, int seek_ti me);
void mpd_sendSeekIdCommand(mpd_Connection * connection, int song, int time) ; void mpd_sendSeekIdCommand(mpd_Connection * connection, int song, int seek_ time);
void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode); void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode);
void mpd_sendSingleCommand(mpd_Connection * connection, int singleMode);
void mpd_sendConsumeCommand(mpd_Connection * connection, int consumeMode);
void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode); void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode);
void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange); void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange);
/* WARNING: don't use volume command, its depreacted */
void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange);
void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds); void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds);
void mpd_sendUpdateCommand(mpd_Connection * connection,const char * path); void mpd_sendUpdateCommand(mpd_Connection * connection,const char * path);
/* returns the update job id, call this after a update command*/ /* returns the update job id, call this after a update command*/
int mpd_getUpdateId(mpd_Connection * connection); int mpd_getUpdateId(mpd_Connection * connection);
void mpd_sendPasswordCommand(mpd_Connection * connection, const char * pass ); void mpd_sendPasswordCommand(mpd_Connection * connection, const char * pass );
/* after executing a command, when your done with it to get its status /* after executing a command, when your done with it to get its status
 End of changes. 7 change blocks. 
5 lines changed or deleted 18 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/