client.h   client.h 
skipping to change at line 46 skipping to change at line 46
#define LSCP_MIDI_CHANNEL_ALL 16 #define LSCP_MIDI_CHANNEL_ALL 16
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client data structures. // Client data structures.
/** Server info cache struct. */ /** Server info cache struct. */
typedef struct _lscp_server_info_t typedef struct _lscp_server_info_t
{ {
char * description; char * description;
char * version; char * version;
char * protocol_version;
} lscp_server_info_t; } lscp_server_info_t;
/** Engine info cache struct. */ /** Engine info cache struct. */
typedef struct _lscp_engine_info_t typedef struct _lscp_engine_info_t
{ {
char * description; char * description;
char * version; char * version;
} lscp_engine_info_t; } lscp_engine_info_t;
skipping to change at line 71 skipping to change at line 72
int audio_device; int audio_device;
int audio_channels; int audio_channels;
char ** audio_routing; char ** audio_routing;
char * instrument_file; char * instrument_file;
int instrument_nr; int instrument_nr;
char * instrument_name; char * instrument_name;
int instrument_status; int instrument_status;
int midi_device; int midi_device;
int midi_port; int midi_port;
int midi_channel; int midi_channel;
int midi_map;
float volume; float volume;
int mute; int mute;
int solo; int solo;
} lscp_channel_info_t; } lscp_channel_info_t;
/** Buffer fill cache struct. */ /** Buffer fill cache struct. */
typedef struct _lscp_buffer_fill_t typedef struct _lscp_buffer_fill_t
{ {
unsigned int stream_id; unsigned int stream_id;
skipping to change at line 96 skipping to change at line 98
typedef enum _lscp_usage_t typedef enum _lscp_usage_t
{ {
LSCP_USAGE_BYTES = 0, LSCP_USAGE_BYTES = 0,
LSCP_USAGE_PERCENTAGE LSCP_USAGE_PERCENTAGE
} lscp_usage_t; } lscp_usage_t;
/** MIDI instrument parameter struct. */ /** MIDI instrument parameter struct. */
typedef struct _lscp_midi_instrument_t typedef struct _lscp_midi_instrument_t
{ {
int bank_msb; int map;
int bank_lsb; int bank;
int program; int prog;
} lscp_midi_instrument_t; } lscp_midi_instrument_t;
/** MIDI instrument load mode. */ /** MIDI instrument load mode. */
typedef enum _lscp_load_mode_t typedef enum _lscp_load_mode_t
{ {
LSCP_LOAD_DEFAULT = 0, LSCP_LOAD_DEFAULT = 0,
LSCP_LOAD_ON_DEMAND, LSCP_LOAD_ON_DEMAND,
LSCP_LOAD_ON_DEMAND_HOLD, LSCP_LOAD_ON_DEMAND_HOLD,
LSCP_LOAD_PERSISTENT LSCP_LOAD_PERSISTENT
skipping to change at line 125 skipping to change at line 127
char * name; char * name;
char * engine_name; char * engine_name;
char * instrument_file; char * instrument_file;
int instrument_nr; int instrument_nr;
char * instrument_name; char * instrument_name;
lscp_load_mode_t load_mode; lscp_load_mode_t load_mode;
float volume; float volume;
} lscp_midi_instrument_info_t; } lscp_midi_instrument_info_t;
/** MIDI instrument map mode. */
typedef enum _lscp_midi_map_mode_t
{
LSCP_MIDI_MAP_NONE = -1,
LSCP_MIDI_MAP_DEFAULT = -2,
LSCP_MIDI_MAP_ALL = -3
} lscp_midi_map_mode_t;
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client socket main structure. // Client socket main structure.
/** Client opaque descriptor struct. */ /** Client opaque descriptor struct. */
typedef struct _lscp_client_t lscp_client_t; typedef struct _lscp_client_t lscp_client_t;
/** Client event callback procedure prototype. */ /** Client event callback procedure prototype. */
typedef lscp_status_t (*lscp_client_proc_t) typedef lscp_status_t (*lscp_client_proc_t)
( (
struct _lscp_client_t *pClient, struct _lscp_client_t *pClient,
lscp_event_t event, lscp_event_t event,
const char *pchData, const char *pchData,
int cchData, int cchData,
void *pvData void *pvData
); );
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client versioning teller fuunction. // Client versioning teller function.
const char * lscp_client_package (void); const char * lscp_client_package (void);
const char * lscp_client_version (void); const char * lscp_client_version (void);
const char * lscp_client_build (void); const char * lscp_client_build (void);
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client socket functions. // Client socket functions.
lscp_client_t * lscp_client_create (const char *pszHos t, int iPort, lscp_client_proc_t pfnCallback, void *pvData); lscp_client_t * lscp_client_create (const char *pszHos t, int iPort, lscp_client_proc_t pfnCallback, void *pvData);
lscp_status_t lscp_client_join (lscp_client_t *pCl ient); lscp_status_t lscp_client_join (lscp_client_t *pCl ient);
skipping to change at line 204 skipping to change at line 215
lscp_buffer_fill_t * lscp_get_channel_buffer_fill (lscp_client_t *pCl ient, lscp_usage_t iUsageType, int iSamplerChannel); lscp_buffer_fill_t * lscp_get_channel_buffer_fill (lscp_client_t *pCl ient, lscp_usage_t iUsageType, int iSamplerChannel);
lscp_status_t lscp_set_channel_audio_type (lscp_client_t *pCl ient, int iSamplerChannel, const char *pszAudioType); lscp_status_t lscp_set_channel_audio_type (lscp_client_t *pCl ient, int iSamplerChannel, const char *pszAudioType);
lscp_status_t lscp_set_channel_audio_device (lscp_client_t *pCl ient, int iSamplerChannel, int iAudioDevice); lscp_status_t lscp_set_channel_audio_device (lscp_client_t *pCl ient, int iSamplerChannel, int iAudioDevice);
lscp_status_t lscp_set_channel_audio_channel (lscp_client_t *pCl ient, int iSamplerChannel, int iAudioOut, int iAudioIn); lscp_status_t lscp_set_channel_audio_channel (lscp_client_t *pCl ient, int iSamplerChannel, int iAudioOut, int iAudioIn);
lscp_status_t lscp_set_channel_midi_type (lscp_client_t *pCl ient, int iSamplerChannel, const char *pszMidiType); lscp_status_t lscp_set_channel_midi_type (lscp_client_t *pCl ient, int iSamplerChannel, const char *pszMidiType);
lscp_status_t lscp_set_channel_midi_device (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiDevice); lscp_status_t lscp_set_channel_midi_device (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiDevice);
lscp_status_t lscp_set_channel_midi_port (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiPort); lscp_status_t lscp_set_channel_midi_port (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiPort);
lscp_status_t lscp_set_channel_midi_channel (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiChannel); lscp_status_t lscp_set_channel_midi_channel (lscp_client_t *pCl ient, int iSamplerChannel, int iMidiChannel);
lscp_status_t lscp_set_channel_midi_map (lscp_client_t *pCl
ient, int iSamplerChannel, int iMidiMap);
lscp_status_t lscp_set_channel_volume (lscp_client_t *pCl ient, int iSamplerChannel, float fVolume); lscp_status_t lscp_set_channel_volume (lscp_client_t *pCl ient, int iSamplerChannel, float fVolume);
lscp_status_t lscp_set_channel_mute (lscp_client_t *pCl ient, int iSamplerChannel, int iMute); lscp_status_t lscp_set_channel_mute (lscp_client_t *pCl ient, int iSamplerChannel, int iMute);
lscp_status_t lscp_set_channel_solo (lscp_client_t *pCl ient, int iSamplerChannel, int iSolo); lscp_status_t lscp_set_channel_solo (lscp_client_t *pCl ient, int iSamplerChannel, int iSolo);
lscp_status_t lscp_reset_channel (lscp_client_t *pCl ient, int iSamplerChannel); lscp_status_t lscp_reset_channel (lscp_client_t *pCl ient, int iSamplerChannel);
lscp_status_t lscp_reset_sampler (lscp_client_t *pCl ient); lscp_status_t lscp_reset_sampler (lscp_client_t *pCl ient);
lscp_server_info_t * lscp_get_server_info (lscp_client_t *pCl ient); lscp_server_info_t * lscp_get_server_info (lscp_client_t *pCl ient);
int lscp_get_total_voice_count (lscp_client_t *pCl ient); int lscp_get_total_voice_count (lscp_client_t *pCl ient);
int lscp_get_total_voice_count_max (lscp_client_t *pCl ient); int lscp_get_total_voice_count_max (lscp_client_t *pCl ient);
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// MIDI instrument mapping control functions. // MIDI instrument mapping control functions.
int lscp_add_midi_instrument_map (lscp_client_t *pCl
ient, const char *pszMapName);
lscp_status_t lscp_remove_midi_instrument_map (lscp_client_t *pCl
ient, int iMidiMap);
int lscp_get_midi_instrument_maps (lscp_client_t *pCl
ient);
int * lscp_list_midi_instrument_maps (lscp_client_t *pCl
ient);
const char * lscp_get_midi_instrument_map_name (lscp_client_t *p
Client, int iMidiMap);
lscp_status_t lscp_set_midi_instrument_map_name (lscp_client_t *p
Client, int iMidiMap, const char *pszMapName);
lscp_status_t lscp_map_midi_instrument (lscp_client_t *pCl ient, lscp_midi_instrument_t *pMidiInstr, const char *pszEngineName, const char *pszFileName, int iInstrIndex, float fVolume, lscp_load_mode_t load_mo de, const char *pszName); lscp_status_t lscp_map_midi_instrument (lscp_client_t *pCl ient, lscp_midi_instrument_t *pMidiInstr, const char *pszEngineName, const char *pszFileName, int iInstrIndex, float fVolume, lscp_load_mode_t load_mo de, const char *pszName);
lscp_status_t lscp_unmap_midi_instrument (lscp_client_t *pCl ient, lscp_midi_instrument_t *pMidiInstr); lscp_status_t lscp_unmap_midi_instrument (lscp_client_t *pCl ient, lscp_midi_instrument_t *pMidiInstr);
int lscp_get_midi_instruments (lscp_client_t *pCl int lscp_get_midi_instruments (lscp_client_t *pCl
ient); ient, int iMidiMap);
lscp_midi_instrument_t *lscp_list_midi_instruments (lscp_client_t *pCl lscp_midi_instrument_t *lscp_list_midi_instruments (lscp_client_t *pCl
ient); ient, int iMidiMap);
lscp_midi_instrument_info_t *lscp_get_midi_instrument_info(lscp_client_t *p Client, lscp_midi_instrument_t *pMidiInstr); lscp_midi_instrument_info_t *lscp_get_midi_instrument_info(lscp_client_t *p Client, lscp_midi_instrument_t *pMidiInstr);
lscp_status_t lscp_clear_midi_instruments (lscp_client_t *pCl ient); lscp_status_t lscp_clear_midi_instruments (lscp_client_t *pCl ient, int iMidiMap);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif // __LSCP_CLIENT_H #endif // __LSCP_CLIENT_H
// end of client.h // end of client.h
 End of changes. 9 change blocks. 
9 lines changed or deleted 38 lines changed or added


 version.h   version.h 
skipping to change at line 27 skipping to change at line 27
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 __LSCP_VERSION_H #ifndef __LSCP_VERSION_H
#define __LSCP_VERSION_H #define __LSCP_VERSION_H
#define LSCP_PACKAGE "liblscp" #define LSCP_PACKAGE "liblscp"
#define LSCP_VERSION "0.4.2" #define LSCP_VERSION "0.5.0"
#endif // __LSCP_VERSION_H #endif // __LSCP_VERSION_H
// end of version.h // end of version.h
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/