Changeset 3926:7b30ce201137 in roaraudio


Ignore:
Timestamp:
06/10/10 13:15:43 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

changed a lot prototyoes

Location:
roard
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • roard/clients.c

    r3925 r3926  
    412412 int r; 
    413413 int rv = 0; 
     414 uint32_t flags[2] = {COMMAND_FLAG_NONE, COMMAND_FLAG_NONE}; 
    414415 
    415416 _CHECK_CID(id); 
    … …  
    433434    oldcmd = m.cmd; 
    434435 
    435     if ( (r = command_exec(id, &m, data)) == -1 ) { 
     436    if ( (r = command_exec(id, &m, &data, flags)) == -1 ) { 
    436437     m.cmd     = ROAR_CMD_ERROR; 
    437438     m.datalen = 0; 

  • roard/commands.c

    r3811 r3926  
    4848 
    4949  {ROAR_CMD_EXEC_STREAM,  _NAME("EXEC_STREAM"),  req_on_exec_stream}, 
    50   {ROAR_CMD_QUIT,         _NAME("QUIT"),         (int(*)(int client, struct roar_message * mes, char * data))clients_delete}, 
     50  {ROAR_CMD_QUIT,         _NAME("QUIT"),         (int(*)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]))clients_delete}, 
    5151 
    5252  {ROAR_CMD_CON_STREAM,   _NAME("CON_STREAM"),   req_on_con_stream}, 
    … …  
    9191} 
    9292 
    93 int command_exec (int client, struct roar_message * mes, char * data) { 
     93int command_exec (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    9494 int cmd = command_get_id_by_cmd(mes->cmd); 
    95  int (*func)(int client, struct roar_message * mes, char * data); 
     95 int (*func)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    9696 
    9797 if ( cmd == -1 ) 
    … …  
    103103 ROAR_DBG("command_exec(*): Execing command %i(%s) via %p", cmd, g_commands[cmd].name, func); 
    104104 
    105  return func(client, mes, data); 
     105 return func(client, mes, data, flags); 
    106106} 
    107107 

  • roard/include/commands.h

    r3811 r3926  
    2121 *  the Free Software Foundation, 51 Franklin Street, Fifth Floor, 
    2222 *  Boston, MA 02110-1301, USA. 
    23  * 
     23 nd_exec* 
    2424 */ 
    2525 
    … …  
    3232#define COMMAND_MAX_COMMANDS 32 
    3333 
     34#define COMMAND_FLAG_NONE          0x00000000 
     35#define COMMAND_FLAG_OUT_CLOSECON  0x00000001 
     36 
    3437struct roar_command { 
    3538 int cmd; 
    … …  
    3942 char * name; 
    4043#endif 
    41  int (*handler)(int client, struct roar_message * mes, char * data); 
     44 int (*handler)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    4245}; 
    4346 
    4447int command_get_id_by_cmd (int command); 
    45 int command_exec (int client, struct roar_message * mes, char * data); 
     48int command_exec (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    4649int command_get_name (int command, char ** name); 
    4750 

  • roard/include/req.h

    r3811 r3926  
    2929#include <roaraudio.h> 
    3030 
    31 int req_on_noop        (int client, struct roar_message * mes, char * data); 
     31int req_on_noop        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    3232 
    33 int req_on_identify    (int client, struct roar_message * mes, char * data); 
    34 int req_on_auth        (int client, struct roar_message * mes, char * data); 
     33int req_on_identify    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     34int req_on_auth        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    3535 
    36 int req_on_whoami      (int client, struct roar_message * mes, char * data); 
     36int req_on_whoami      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    3737 
    38 int req_on_new_stream  (int client, struct roar_message * mes, char * data); 
    39 int req_on_exec_stream (int client, struct roar_message * mes, char * data); 
    40 int req_on_con_stream  (int client, struct roar_message * mes, char * data); 
    41 int req_on_passfh      (int client, struct roar_message * mes, char * data); 
     38int req_on_new_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     39int req_on_exec_stream (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     40int req_on_con_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     41int req_on_passfh      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    4242 
    4343#ifdef ROAR_SUPPORT_META 
    44 int req_on_set_meta    (int client, struct roar_message * mes, char * data); 
    45 int req_on_get_meta    (int client, struct roar_message * mes, char * data); 
    46 int req_on_list_meta   (int client, struct roar_message * mes, char * data); 
     44int req_on_set_meta    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     45int req_on_get_meta    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     46int req_on_list_meta   (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    4747#endif 
    4848 
    49 int req_on_get_standby (int client, struct roar_message * mes, char * data); 
    50 int req_on_set_standby (int client, struct roar_message * mes, char * data); 
     49int req_on_get_standby (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     50int req_on_set_standby (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    5151 
    52 int req_on_exit        (int client, struct roar_message * mes, char * data); 
     52int req_on_exit        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    5353 
    54 int req_on_server_oinfo(int client, struct roar_message * mes, char * data); 
     54int req_on_server_oinfo(int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    5555 
    56 int req_on_list_clients(int client, struct roar_message * mes, char * data); 
    57 int req_on_list_streams(int client, struct roar_message * mes, char * data); 
     56int req_on_list_clients(int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     57int req_on_list_streams(int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    5858 
    59 int req_on_get_client  (int client, struct roar_message * mes, char * data); 
    60 int req_on_get_stream  (int client, struct roar_message * mes, char * data); 
     59int req_on_get_client  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     60int req_on_get_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    6161 
    62 int req_on_get_stream_para (int client, struct roar_message * mes, char * data); 
    63 int req_on_set_stream_para (int client, struct roar_message * mes, char * data); 
     62int req_on_get_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     63int req_on_set_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    6464 
    65 int req_on_kick        (int client, struct roar_message * mes, char * data); 
    66 int req_on_attach      (int client, struct roar_message * mes, char * data); 
     65int req_on_kick        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     66int req_on_attach      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    6767 
    68 int req_on_set_vol     (int client, struct roar_message * mes, char * data); 
    69 int req_on_get_vol     (int client, struct roar_message * mes, char * data); 
     68int req_on_set_vol     (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
     69int req_on_get_vol     (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    7070 
    71 int req_on_add_data    (int client, struct roar_message * mes, char * data); 
     71int req_on_add_data    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    7272 
    73 int req_on_beep        (int client, struct roar_message * mes, char * data); 
     73int req_on_beep        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    7474 
    75 //int req_on_ (int client, struct roar_message * mes, char * data); 
     75//int req_on_ (int client, struct roar_message * mes, char ** data, uint32_t flags[2]); 
    7676 
    7777#endif 

  • roard/req.c

    r3802 r3926  
    2626#include "roard.h" 
    2727 
    28 int req_on_noop        (int client, struct roar_message * mes, char * data) { 
     28int req_on_noop        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    2929 mes->cmd     = ROAR_CMD_OK; 
    3030 mes->pos     = g_pos; 
    … …  
    3333} 
    3434 
    35 int req_on_identify    (int client, struct roar_message * mes, char * data) { 
     35int req_on_identify    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    3636 struct roar_client * c; 
    3737 int max_len; 
    … …  
    6767} 
    6868 
    69 int req_on_auth        (int client, struct roar_message * mes, char * data) { 
     69int req_on_auth        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    7070 // TODO: add code to support some auth. 
    7171 mes->cmd     = ROAR_CMD_OK; 
    … …  
    7676 
    7777 
    78 int req_on_whoami      (int client, struct roar_message * mes, char * data) { 
     78int req_on_whoami      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    7979 mes->cmd     = ROAR_CMD_OK; 
    8080 mes->pos     = g_pos; 
    … …  
    8585 
    8686 
    87 int req_on_new_stream  (int client, struct roar_message * mes, char * data) { 
     87int req_on_new_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    8888 int stream; 
    8989 struct roar_stream * s; 
    … …  
    230230} 
    231231 
    232 int req_on_exec_stream (int client, struct roar_message * mes, char * data) { 
     232int req_on_exec_stream (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    233233 int r; 
    234234 
    … …  
    245245} 
    246246 
    247 int req_on_con_stream  (int client, struct roar_message * mes, char * data) { 
     247int req_on_con_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    248248 char   host[80] = {0}; 
    249249 int    port = 0; 
    … …  
    294294} 
    295295 
    296 int req_on_passfh      (int client, struct roar_message * mes, char * data) { 
     296int req_on_passfh      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    297297 int sock = clients_get_fh(client); 
    298298 int16_t * d = (int16_t*)mes->data; 
    … …  
    366366 
    367367#ifdef ROAR_SUPPORT_META 
    368 int req_on_set_meta    (int client, struct roar_message * mes, char * data) { 
     368int req_on_set_meta    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    369369 int type; 
    370370 int mode; 
    … …  
    438438} 
    439439 
    440 int req_on_get_meta    (int client, struct roar_message * mes, char * data) { 
     440int req_on_get_meta    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    441441 int vallen; 
    442442 int type; 
    … …  
    469469} 
    470470 
    471 int req_on_list_meta   (int client, struct roar_message * mes, char * data) { 
     471int req_on_list_meta   (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    472472 int i; 
    473473 int len = 0; 
    … …  
    494494#endif 
    495495 
    496 int req_on_server_oinfo    (int client, struct roar_message * mes, char * data) { 
     496int req_on_server_oinfo    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    497497 struct roar_stream s; 
    498498//ROAR_DIR_OUTPUT 
    … …  
    517517 
    518518 
    519 int req_on_get_standby (int client, struct roar_message * mes, char * data) { 
     519int req_on_get_standby (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    520520 mes->cmd     = ROAR_CMD_OK; 
    521521 mes->pos     = g_pos; 
    … …  
    527527} 
    528528 
    529 int req_on_set_standby (int client, struct roar_message * mes, char * data) { 
     529int req_on_set_standby (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    530530 if ( mes->datalen != 2 ) 
    531531  return -1; 
    … …  
    540540} 
    541541 
    542 int req_on_exit      (int client, struct roar_message * mes, char * data) { 
     542int req_on_exit      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    543543 int term = 0; 
    544544 
    … …  
    561561} 
    562562 
    563 int req_on_list_clients(int client, struct roar_message * mes, char * data) { 
     563int req_on_list_clients(int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    564564 unsigned char filter, cmp; 
    565565 uint32_t id; 
    … …  
    586586 return 0; 
    587587} 
    588 int req_on_list_streams(int client, struct roar_message * mes, char * data) { 
     588int req_on_list_streams(int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    589589 unsigned char filter, cmp; 
    590590 uint32_t id; 
    … …  
    612612} 
    613613 
    614 int req_on_get_client  (int client, struct roar_message * mes, char * data) { 
     614int req_on_get_client  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    615615 struct roar_client * c; 
    616616 
    … …  
    626626} 
    627627 
    628 int req_on_get_stream  (int client, struct roar_message * mes, char * data) { 
     628int req_on_get_stream  (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    629629 struct roar_stream_server * s; 
    630630 
    … …  
    641641} 
    642642 
    643 int req_on_get_stream_para (int client, struct roar_message * mes, char * data) { 
     643int req_on_get_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    644644 struct roar_stream * s; 
    645645 struct roar_stream_server * ss; 
    … …  
    741741} 
    742742 
    743 int req_on_set_stream_para (int client, struct roar_message * mes, char * data) { 
     743int req_on_set_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    744744 uint16_t * d = (uint16_t *) mes->data; 
    745745 int i; 
    … …  
    798798} 
    799799 
    800 int req_on_kick (int client, struct roar_message * mes, char * data) { 
     800int req_on_kick (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    801801 uint16_t * info = (uint16_t *) mes->data; 
    802802 
    … …  
    833833} 
    834834 
    835 int req_on_attach      (int client, struct roar_message * mes, char * data) { 
     835int req_on_attach      (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    836836 uint16_t * info = (uint16_t *) mes->data; 
    837837 
    … …  
    859859} 
    860860 
    861 int req_on_set_vol (int client, struct roar_message * mes, char * data) { 
     861int req_on_set_vol (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    862862 struct roar_stream_server * s; 
    863863 uint16_t * info = (uint16_t *) mes->data; 
    … …  
    949949} 
    950950 
    951 int req_on_get_vol (int client, struct roar_message * mes, char * data) { 
     951int req_on_get_vol (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    952952 uint16_t * info = (uint16_t *) mes->data; 
    953953 uint16_t   version = -1; 
    … …  
    10311031} 
    10321032 
    1033 int req_on_add_data (int client, struct roar_message * mes, char * data) { 
     1033int req_on_add_data (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    10341034 struct roar_buffer * b; 
    10351035 char               * buf; 
    … …  
    10441044  memcpy(buf, mes->data, mes->datalen); 
    10451045 } else { 
    1046   memcpy(buf, data, mes->datalen); 
     1046  memcpy(buf, *data, mes->datalen); 
    10471047 } 
    10481048 
    … …  
    10581058} 
    10591059 
    1060 int req_on_beep        (int client, struct roar_message * mes, char * data) { 
     1060int req_on_beep        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 
    10611061 struct roar_beep bs; 
    10621062 int16_t * info = (int16_t*)mes->data; 
Note: See TracChangeset for help on using the changeset viewer.