diff src/xs_config.h @ 722:5923dfff1fac

Unify xs_sid*_filter_t into one.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 10 Feb 2009 03:25:49 +0200
parents cab9d2b182e8
children d9d769b5dbe2
line wrap: on
line diff
--- a/src/xs_config.h	Tue Feb 10 03:20:07 2009 +0200
+++ b/src/xs_config.h	Tue Feb 10 03:25:49 2009 +0200
@@ -71,6 +71,9 @@
     gchar           *name;
     gint            type;
     
+    /* Filter type 0 for SIDPlay 1 */
+    gfloat          fs, fm, ft;
+    
     /* Filter type 1-2 points */
     xs_int_point_t  points[XS_SIDPLAY2_NFPOINTS];
     gint            npoints;
@@ -85,12 +88,7 @@
     
     /* Filter Type 4 tunables */
     gfloat          k, b;
-} xs_sid2_filter_t;
-
-
-typedef struct {
-    gfloat fs, fm, ft;
-} xs_sid1_filter_t;
+} xs_sid_filter_t;
 
 
 extern struct xs_cfg_t {
@@ -112,12 +110,12 @@
     gint        playerEngine;       /* Selected player engine */
 
     gboolean    emulateFilters;
-    xs_sid1_filter_t    sid1Filter;
+    xs_sid_filter_t    sid1Filter;  /* Current SIDPlay1 filter */
 
     gint        sid2OptLevel;       /* SIDPlay2 emulation optimization */
     gint        sid2Builder;        /* SIDPlay2 "builder" aka SID-emu */
-    xs_sid2_filter_t    sid2Filter; /* Current SIDPlay2 filter */
-    xs_sid2_filter_t    **sid2FilterPresets;
+    xs_sid_filter_t    sid2Filter;  /* Current SIDPlay2 filter */
+    xs_sid_filter_t    **sid2FilterPresets;
     gint        sid2NFilterPresets;