Changeset 5932:8f1c725d66c3 in roaraudio


Ignore:
Timestamp:
09/11/13 17:27:30 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added support to send RoarDMX events

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/man1/roarlight.1

    r5930 r5932  
    4444Same as sset command. 
    4545 
     46.TP 
     47\fBevent EVENT\fR 
     48Send event EVENT to the server. 
     49 
    4650.SH "SEE ALSO" 
    4751\fBroarctl\fR(1), 
  • roarclients/roarlight.c

    r5930 r5932  
    5050        "  sset  chan=val          - Set a DMX Channel\n" 
    5151        "  set   chan=val          - Same as sset\n" 
     52        "  event EVENT             - Send event EVENT\n" 
    5253       ); 
    5354} 
     
    9192} 
    9293 
     94static int cmd_event (char * arg) { 
     95 struct roar_roardmx_message mes; 
     96 int event; 
     97 char * p; 
     98 
     99 if ( roar_roardmx_message_new_event(&mes) == -1 ) 
     100  return -1; 
     101 
     102 while (arg != NULL) { 
     103  p = strstr(arg, ","); 
     104  if ( p != NULL ) { 
     105   *p = 0; 
     106    p++; 
     107  } 
     108 
     109  event = roar_roardmx_str2event(arg); 
     110  if ( event == -1 ) 
     111   return -1; 
     112 
     113  roar_roardmx_message_add_event(&mes, event); 
     114 
     115  arg = p; 
     116 } 
     117 
     118 if ( roar_roardmx_message_send(&mes, g_stream) == -1 ) 
     119  return -1; 
     120 
     121 return 0; 
     122} 
     123 
    93124static int __run_argv(int argc, char * argv[]) { 
    94125 char * k; 
     
    113144   } else { 
    114145    printf("channels changed\n"); 
     146   } 
     147  } else if ( !strcmp(k, "event") ) { 
     148   i++; 
     149   if ( cmd_event(argv[i]) == -1 ) { 
     150    fprintf(stderr, "Error: can not send event\n"); 
     151   } else { 
     152    printf("event send\n"); 
    115153   } 
    116154 
Note: See TracChangeset for help on using the changeset viewer.