lscp_client.h   lscp_client.h 
skipping to change at line 96 skipping to change at line 96
void *pvData void *pvData
); );
typedef struct _lscp_client_t { typedef struct _lscp_client_t {
// Client socket stuff. // Client socket stuff.
lscp_client_proc_t pfnCallback; lscp_client_proc_t pfnCallback;
void * pvData; void * pvData;
lscp_socket_agent_t tcp; lscp_socket_agent_t tcp;
lscp_socket_agent_t udp; lscp_socket_agent_t udp;
// Session identifier.
char * sessid;
// Info struct caches. // Info struct caches.
const char ** engines; const char ** engines;
lscp_engine_info_t engine_info; lscp_engine_info_t engine_info;
lscp_channel_info_t channel_info; lscp_channel_info_t channel_info;
// Result and error status. // Result and error status.
char * pszResult; char * pszResult;
int iErrno; int iErrno;
// Stream buffers status. // Stream buffers status.
lscp_buffer_fill_t *buffer_fill; lscp_buffer_fill_t *buffer_fill;
int iStreamCount; int iStreamCount;
skipping to change at line 131 skipping to change at line 133
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client common protocol functions. // Client common protocol functions.
lscp_status_t lscp_client_query (lscp_client_t *pClient, const char *pszQuery); lscp_status_t lscp_client_query (lscp_client_t *pClient, const char *pszQuery);
const char * lscp_client_get_result (lscp_client_t *pClient ); const char * lscp_client_get_result (lscp_client_t *pClient );
int lscp_client_get_errno (lscp_client_t *pClient ); int lscp_client_get_errno (lscp_client_t *pClient );
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Client command protocol functions. // Client command protocol functions.
lscp_status_t lscp_load_instrument (lscp_client_t *pCl lscp_status_t lscp_load_instrument (lscp_client_t *pCl
ient, const char *pszFileName, int iIndex, int iChannel); ient, const char *pszFileName, int iInstrIndex, int iSamplerChannel);
lscp_status_t lscp_load_engine (lscp_client_t *pCl lscp_status_t lscp_load_engine (lscp_client_t *pCl
ient, const char *pszEngineName, int iChannel); ient, const char *pszEngineName, int iSamplerChannel);
int lscp_get_channels (lscp_client_t *pCl ient); int lscp_get_channels (lscp_client_t *pCl ient);
lscp_status_t lscp_add_channel (lscp_client_t *pCl ient); lscp_status_t lscp_add_channel (lscp_client_t *pCl ient);
lscp_status_t lscp_remove_channel (lscp_client_t *pCl ient, int iChannel); lscp_status_t lscp_remove_channel (lscp_client_t *pCl ient, int iSamplerChannel);
const char ** lscp_get_available_engines (lscp_client_t *pCl ient); const char ** lscp_get_available_engines (lscp_client_t *pCl ient);
lscp_engine_info_t * lscp_get_engine_info (lscp_client_t *pCl ient, const char *pszEngineName); lscp_engine_info_t * lscp_get_engine_info (lscp_client_t *pCl ient, const char *pszEngineName);
lscp_channel_info_t * lscp_get_channel_info (lscp_client_t *pCl ient, int iChannel); lscp_channel_info_t * lscp_get_channel_info (lscp_client_t *pCl ient, int iSamplerChannel);
int lscp_get_channel_voice_count (lscp_client_t *pCl int lscp_get_channel_voice_count (lscp_client_t *pCl
ient, int iChannel); ient, int iSamplerChannel);
int lscp_get_channel_stream_count (lscp_client_t *pCl int lscp_get_channel_stream_count (lscp_client_t *pCl
ient, int iChannel); ient, int iSamplerChannel);
lscp_buffer_fill_t * lscp_get_channel_buffer_fill (lscp_client_t *pCl ient, lscp_usage_t usage_type, int iChannel); 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 lscp_status_t lscp_set_channel_audio_type (lscp_client_t *pCl
ient, int iChannel, lscp_audio_t audio_type); ient, int iSamplerChannel, lscp_audio_t iAudioType);
lscp_status_t lscp_set_channel_audio_channel (lscp_client_t *pCl lscp_status_t lscp_set_channel_audio_channel (lscp_client_t *pCl
ient, int iChannel, int audio_channel); ient, int iSamplerChannel, int iAudioChannel);
lscp_status_t lscp_set_channel_midi_type (lscp_client_t *pCl lscp_status_t lscp_set_channel_midi_type (lscp_client_t *pCl
ient, int iChannel, lscp_midi_t midi_type); ient, int iSamplerChannel, lscp_midi_t iMidiType);
lscp_status_t lscp_set_channel_midi_port (lscp_client_t *pCl lscp_status_t lscp_set_channel_midi_port (lscp_client_t *pCl
ient, int iChannel, const char *midi_port); ient, int iSamplerChannel, const char *pszMidiPort);
lscp_status_t lscp_set_channel_midi_channel (lscp_client_t *pCl lscp_status_t lscp_set_channel_midi_channel (lscp_client_t *pCl
ient, int iChannel, int midi_channel); ient, int iSamplerChannel, int iMidiChannel);
lscp_status_t lscp_set_channel_volume (lscp_client_t *pCl lscp_status_t lscp_set_channel_volume (lscp_client_t *pCl
ient, int iChannel, float volume); ient, int iSamplerChannel, float fVolume);
lscp_status_t lscp_reset_channel (lscp_client_t *pCl ient, int iChannel); lscp_status_t lscp_reset_channel (lscp_client_t *pCl ient, int iSamplerChannel);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif // __LSCP_CLIENT_H #endif // __LSCP_CLIENT_H
// end of lscp_client.h // end of lscp_client.h
 End of changes. 9 change blocks. 
24 lines changed or deleted 26 lines changed or added


 lscp_server.h   lscp_server.h 
skipping to change at line 33 skipping to change at line 33
// Server sockets. // Server sockets.
struct _lscp_server_t; struct _lscp_server_t;
typedef struct _lscp_connect_t typedef struct _lscp_connect_t
{ {
struct _lscp_server_t *server; struct _lscp_server_t *server;
lscp_socket_agent_t client; lscp_socket_agent_t client;
int port; int port;
int ping; int ping;
char * sessid;
struct _lscp_connect_t *prev; struct _lscp_connect_t *prev;
struct _lscp_connect_t *next; struct _lscp_connect_t *next;
} lscp_connect_t; } lscp_connect_t;
typedef struct _lscp_connect_list_t typedef struct _lscp_connect_list_t
{ {
lscp_connect_t *first; lscp_connect_t *first;
lscp_connect_t *last; lscp_connect_t *last;
unsigned int count; unsigned int count;
skipping to change at line 79 skipping to change at line 80
lscp_server_t* lscp_server_create (int iPort, lscp_server_proc_t pfnC allback, void *pvData); lscp_server_t* lscp_server_create (int iPort, lscp_server_proc_t pfnC allback, void *pvData);
lscp_server_t* lscp_server_create_ex (int iPort, lscp_server_proc_t pfnC allback, void *pvData, lscp_server_mode_t mode); lscp_server_t* lscp_server_create_ex (int iPort, lscp_server_proc_t pfnC allback, void *pvData, lscp_server_mode_t mode);
lscp_status_t lscp_server_join (lscp_server_t *pServer); lscp_status_t lscp_server_join (lscp_server_t *pServer);
lscp_status_t lscp_server_destroy (lscp_server_t *pServer); lscp_status_t lscp_server_destroy (lscp_server_t *pServer);
lscp_status_t lscp_server_broadcast (lscp_server_t *pServer, const char *pchBuffer, int cchBuffer); lscp_status_t lscp_server_broadcast (lscp_server_t *pServer, const char *pchBuffer, int cchBuffer);
lscp_status_t lscp_server_result (lscp_connect_t *pConnect, const ch ar *pchBuffer, int cchBuffer); lscp_status_t lscp_server_result (lscp_connect_t *pConnect, const ch ar *pchBuffer, int cchBuffer);
lscp_status_t lscp_server_subscribe (lscp_connect_t *pConnect, int iPor t); lscp_status_t lscp_server_subscribe (lscp_connect_t *pConnect, int iPor t);
lscp_status_t lscp_server_unsubscribe (lscp_connect_t *pConnect, const ch ar *pszSessionID); lscp_status_t lscp_server_unsubscribe (lscp_connect_t *pConnect, const ch ar *pszSessID);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif // __LSCP_SERVER_H #endif // __LSCP_SERVER_H
// end of lscp_server.h // end of lscp_server.h
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 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/