Changeset 361

Show
Ignore:
Timestamp:
02/19/06 13:20:00 (3 years ago)
Author:
kickback
Message:

sweep-jack-testing:play.c: fix more merging errors and wrap some jack stuff in #ifdefs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/branches/sweep-jack-testing/src/play.c

    r356 r361  
    6868#define USE_MONITOR_KEY "UseMonitor" 
    6969 
     70#ifdef DRIVER_JACK 
    7071extern jack_client_t * jack_client; 
     72#endif 
    7173 
    7274GMutex * play_mutex = NULL; 
    …… 
    719721  if (*heads == NULL) return; 
    720722 
    721   n = PSIZ; 
    722    
    723723  for (gl = *heads; gl; gl = gl_next) { 
    724724