Changeset 472

Show
Ignore:
Timestamp:
01/20/07 09:32:42 (2 years ago)
Author:
kickback
Message:

move driver tdb keys into driver struct. allows unique settings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/src/driver.c

    r272 r472  
    9696  char * main_dev; 
    9797 
    98   main_dev = prefs_get_string (DEV_KEY); 
     98  main_dev = prefs_get_string (pref->primary_device_key); 
    9999 
    100100  if (main_dev == NULL) return pcmio_get_default_main_dev(); 
    …… 
    108108  char * monitor_dev; 
    109109 
    110   monitor_dev = prefs_get_string (MONITOR_DEV_KEY); 
     110  monitor_dev = prefs_get_string (pref->monitor_device_key); 
    111111 
    112112  if (monitor_dev == NULL) return pcmio_get_default_monitor_dev (); 
    …… 
    131131  int * log_frags; 
    132132 
    133   log_frags = prefs_get_int (LOG_FRAGS_KEY); 
    134  
     133  log_frags = prefs_get_int (pref->log_frags_key); 
    135134  if (log_frags == NULL) return DEFAULT_LOG_FRAGS; 
    136135  else return (*log_frags); 
    …… 
    164163  adj = g_object_get_data (G_OBJECT(dialog), "buff_adj"); 
    165164 
    166   prefs_set_int (LOG_FRAGS_KEY, adj->value); 
     165  prefs_set_int (pref->log_frags_key, adj->value); 
    167166 
    168167  main_dev = 
    169168    gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(main_combo)->entry)); 
    170169 
    171   prefs_set_string (DEV_KEY, (gchar *)main_dev); 
     170  prefs_set_string (pref->primary_device_key, (gchar *)main_dev); 
    172171 
    173172  if (monitor_checked (dialog)) { 
    174173    monitor_dev = 
    175174      gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(monitor_combo)->entry));  
    176     prefs_set_string (MONITOR_DEV_KEY, (gchar *)monitor_dev); 
     175    prefs_set_string (pref->monitor_device_key, (gchar *)monitor_dev); 
    177176 
    178177    prefs_set_int (USE_MONITOR_KEY, 1); 

  • sweep/trunk/src/driver.h

    r124 r472  
    5252  void (*drain) (sw_handle * handle); 
    5353  void (*close) (sw_handle * handle); 
     54   
     55  char * primary_device_key; 
     56  char * monitor_device_key; 
     57  char * log_frags_key; 
    5458}; 
    5559 

  • sweep/trunk/src/driver_alsa.c

    r198 r472  
    452452  alsa_device_flush, 
    453453  alsa_device_drain, 
    454   alsa_device_close 
     454  alsa_device_close, 
     455  "alsa_primary_device", 
     456  "alsa_monitor_device", 
     457  "alsa_log_frags" 
    455458}; 
    456459 

  • sweep/trunk/src/driver_oss.c

    r124 r472  
    445445  drain_dev_dsp, 
    446446  close_dev_dsp, 
     447  "oss_primary_device", 
     448  "oss_monitor_device", 
     449  "oss_log_frags" 
    447450}; 
    448451 

  • sweep/trunk/src/driver_solaris.c

    r124 r472  
    125125  drain_dev_audio, 
    126126  close_dev_audio, 
     127  "solaris_primary_device", 
     128  "solaris_monitor_device", 
     129  "solaris_log_frags" 
    127130}; 
    128131 

  • sweep/trunk/src/pcmio.h

    r124 r472  
    2424#include <glib.h> 
    2525 
    26 #define DEV_KEY "OSS_Device" 
    27 #define MONITOR_DEV_KEY "OSS_MonitorDevice" 
    28 #define LOG_FRAGS_KEY "OSS_Logfrags" 
    29  
    3026#define USE_MONITOR_KEY "UseMonitor" 
    3127