Changeset 5194:b40015b16ff2 in roaraudio


Ignore:
Timestamp:
10/23/11 12:21:39 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

make more use of /extern/

Location:
roard
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • roard/include/caps.h

    r4708 r5194  
    2929#include <roaraudio.h> 
    3030 
    31 struct roar_stds g_caps_stds; 
     31extern struct roar_stds g_caps_stds; 
    3232 
    3333char * stds_string (void); 
  • roard/include/light.h

    r4708 r5194  
    3333#define LIGHT_CHANNELS_DEFAULT 512 /* one DMX Universe */ 
    3434 
    35 struct { 
     35extern struct light_state { 
    3636 unsigned int    channels; 
    3737 unsigned char * state; 
     
    3939} g_light_state; 
    4040 
    41 struct { 
     41extern struct light_mixer { 
    4242 int stream; 
    4343} g_light_mixer; 
  • roard/include/midi.h

    r4708 r5194  
    8383#define MIDI_INITED_CLOCK       0x04 
    8484 
    85 struct { 
     85extern struct midi_config { 
    8686 int init; 
    8787 int inited; 
     
    107107}; 
    108108 
    109 struct { 
     109extern struct midi_state_mess { 
    110110 struct roar_buffer * buf; 
    111111} g_midi_mess; 
    112112 
    113113#ifndef ROAR_WITHOUT_DCOMP_CB 
    114 struct { 
     114extern struct midi_state_cb { 
    115115 int      console; 
    116116 int      stream; 
     
    120120#endif 
    121121 
    122 struct { 
     122extern struct midi_clock { 
    123123 int stream; 
    124124 uint_least32_t bph; // beats per hour 
     
    127127} g_midi_clock; 
    128128 
    129 struct { 
     129extern struct midi_mixer { 
    130130 int stream; 
    131131} g_midi_mixer; 
  • roard/include/rdtcs.h

    r4708 r5194  
    4848#define RDTCS_RDS_FLAG_CT     0x0002 
    4949 
    50 struct { 
     50extern struct rdtcs_state { 
    5151 int inited; 
    5252 struct { 
  • roard/include/roard.h

    r5192 r5194  
    2828 
    2929// configure ROAR_INFO() 
    30 int g_verbose; 
     30extern int g_verbose; 
    3131#define ROAR_DBG_INFOVAR g_verbose 
    3232 
     
    193193#define CONF_DEF_STRING "***default***" 
    194194 
    195 struct roard_config { 
     195extern struct roard_config { 
    196196 uint32_t flags; 
    197197 struct { 
     
    219219}; 
    220220 
    221 struct { 
     221extern struct counters { 
    222222 struct _counters cur, sum; 
    223223} g_counters; 
  • roard/include/sources.h

    r4919 r5194  
    4343}; 
    4444 
    45 int g_source_client; 
    46  
    4745int sources_init (void); 
    4846int sources_free (void); 
  • roard/include/ssynth.h

    r5192 r5194  
    5252extern float ssynth_polys[SSYNTH_POLY_POLYMAX][SSYNTH_POLY_COEFF]; 
    5353 
    54 struct { 
     54extern struct ssynth_conf { 
    5555 int enable; 
    5656} ssynth_conf; 
  • roard/include/streams.h

    r5192 r5194  
    118118} * g_streams[ROAR_STREAMS_MAX]; 
    119119 
    120 int streams_recsource_id; 
     120extern int streams_recsource_id; 
    121121 
    122122void streams_change_sync_num(int id, int diff); 
  • roard/include/waveform.h

    r4820 r5194  
    2929#include <roaraudio.h> 
    3030 
    31 struct { 
     31struct waveform_stream { 
    3232 int stream; 
    3333 struct roar_stream_server * ss; 
    34 } g_waveform_mixer; 
     34}; 
    3535 
    36 struct { 
    37  int stream; 
    38  struct roar_stream_server * ss; 
    39 } g_waveform_recbridge; 
     36extern struct waveform_stream g_waveform_mixer, g_waveform_recbridge; 
    4037 
    4138int waveform_init  (void); 
  • roard/light.c

    r4957 r5194  
    2727 
    2828#ifndef ROAR_WITHOUT_DCOMP_LIGHT 
     29 
     30// declared 'extern' 
     31struct light_state g_light_state; 
     32struct light_mixer g_light_mixer; 
     33// // 
    2934 
    3035int light_init  (unsigned int channels) { 
  • roard/midi.c

    r5162 r5194  
    2727 
    2828#ifndef ROAR_WITHOUT_DCOMP_MIDI 
     29 
     30// declared 'extern' 
     31struct midi_config midi_config; 
     32struct midi_state_mess g_midi_mess; 
     33struct midi_state_cb g_midi_cb; 
     34struct midi_clock g_midi_clock; 
     35struct midi_mixer g_midi_mixer; 
     36// // 
    2937 
    3038#if defined(ROAR_HAVE_IO_POSIX) && !defined(ROAR_TARGET_WIN32) 
  • roard/rdtcs.c

    r4708 r5194  
    2727 
    2828#ifndef ROAR_WITHOUT_DCOMP_RDTCS 
     29 
     30// declared 'extern' 
     31struct rdtcs_state g_rdtcs; 
    2932 
    3033int rdtcs_init  (void) { 
  • roard/roard.c

    r5192 r5194  
    5656 
    5757// some stuff we only define extern globally. 
     58int g_verbose = ROAR_DBG_INFO_NONE; 
     59 
    5860int alive; 
    5961#ifdef ROAR_SUPPORT_LISTEN 
     
    7375 
    7476struct roar_audio_info * g_sa, * g_max_sa; 
     77 
     78struct roard_config * g_config; 
     79 
     80struct counters g_counters; 
    7581// end of extern block. 
    7682 
  • roard/sources.c

    r5162 r5194  
    2828#ifndef ROAR_WITHOUT_DCOMP_SOURCES 
    2929 
     30static int g_source_client = -1; 
     31 
    3032#define ROAR_SOURCE_DEFAULT "cf" 
    3133 
     
    4547 
    4648int sources_init (void) { 
    47  g_source_client = -1; 
    4849 return 0; 
    4950} 
  • roard/ssynth.c

    r5192 r5194  
    3232       {0.700010, -0.083333, -0.150000,  0.033333} 
    3333      }; 
     34 
     35struct ssynth_conf ssynth_conf; 
    3436 
    3537struct ssynth_state g_ssynth; 
  • roard/waveform.c

    r4821 r5194  
    2525 
    2626#include "roard.h" 
     27 
     28// declared 'extern'. 
     29struct waveform_stream g_waveform_mixer, g_waveform_recbridge; 
    2730 
    2831static int waveform_init_recbridge (void) { 
Note: See TracChangeset for help on using the changeset viewer.