Merge lp:~mixxxdevelopers/mixxx/multi-playlist-crates into lp:~mhaulo/mixxx/multilevel_crates_playlists

[RAFFI TEA]

Hey Mika,

you had some problems with your branch. To help you I have finalized your crate stuff. I now give you the honour to complete the mulilevel playlists :-)

Just to note down some current issues:
- Try to create two crates below the root-level. It is not possible to add two equal named subcrates to the different parents.

- It would be cool feature if one can move the crates to upper or lower hierachies via drag 'n drop

- It is a good idea to remove "Add crate/playlist" from the main menu

[RAFFI TEA (raffitea)]

JFI: My branch has been merged with current trunk. This is why the diff is huge.

[Mika Haulo (mhaulo)]

Wow, thanks! This helps a lot. I actually got to the point where the crate tree was almost working, but your implementation looks much better.
Allowing equal names introduced a few minor bugs, but I'm already fixing those.

[RAFFI TEA (raffitea)]

You're welcome. Looking forward to see this feature in trunk one day :-)

With that I can improve the Traktor library feature, e.g., I could offer an option "Migrate to Mixxx library" which will convert the Traktor multilevel playlists to Mixxx playlists.

=== modified file 'mixxx/SConstruct'
--- mixxx/SConstruct	2011-03-07 22:25:20 +0000
+++ mixxx/SConstruct	2011-04-22 09:04:29 +0000
@@ -50,6 +50,7 @@
                       features.MSVSHacks,
 
                       # "Features" of dubious quality
+                      features.PerfTools,
                       features.AsmLib,
                       features.Tonal,
                       features.IPod,

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-03-31 06:57:35 +0000
+++ mixxx/build/depends.py	2011-04-22 09:04:29 +0000
@@ -336,6 +336,7 @@
                    "dlgprefcontrols.cpp",
                    "dlgprefbpm.cpp",
                    "dlgprefreplaygain.cpp",
+                   "dlgprefnovinyl.cpp",
                    "dlgbpmscheme.cpp",
                    "dlgabout.cpp",
                    "dlgprefeq.cpp",
@@ -367,14 +368,20 @@
                    "engine/enginesidechain.cpp",
                    "engine/enginefilterbutterworth8.cpp",
                    "engine/enginexfader.cpp",
+                   "engine/enginemicrophone.cpp",
+                   "engine/enginedeck.cpp",
+                   "engine/enginepassthrough.cpp",
+
                    "engine/enginecontrol.cpp",
                    "engine/ratecontrol.cpp",
                    "engine/loopingcontrol.cpp",
                    "engine/bpmcontrol.cpp",
                    "engine/cuecontrol.cpp",
+                   "engine/quantizecontrol.cpp",
                    "engine/clockcontrol.cpp",
                    "engine/readaheadmanager.cpp",
                    "cachingreader.cpp",
+
                    "analyserrg.cpp",
                    "analyserqueue.cpp",
                    "analyserwavesummary.cpp",
@@ -455,6 +462,10 @@
                    "library/browse/browsethread.cpp",
                    "library/browse/browsefeature.cpp",
                    "library/browse/foldertreemodel.cpp",
+                   
+                   "library/recording/recordingfeature.cpp",
+                   "dlgrecording.cpp",
+                   "recording/recordingmanager.cpp",
 
                    # External Library Features
                    "library/rhythmbox/rhythmboxfeature.cpp",
@@ -545,7 +556,7 @@
                    "sounddevice.cpp",
                    "soundmanager.cpp",
                    "soundmanagerconfig.cpp",
-                   "audiopath.cpp",
+                   "soundmanagerutil.cpp",
                    "dlgprefrecord.cpp",
                    "playerinfo.cpp",
 
@@ -571,6 +582,7 @@
         build.env.Uic4('dlgbpmschemedlg.ui')
         # build.env.Uic4('dlgbpmtapdlg.ui')
         build.env.Uic4('dlgprefvinyldlg.ui')
+        build.env.Uic4('dlgprefnovinyldlg.ui')
         build.env.Uic4('dlgprefrecorddlg.ui')
         build.env.Uic4('dlgaboutdlg.ui')
         build.env.Uic4('dlgmidilearning.ui')
@@ -578,6 +590,8 @@
         build.env.Uic4('dlgprepare.ui')
         build.env.Uic4('dlgautodj.ui')
         build.env.Uic4('dlgprefsounditem.ui')
+        build.env.Uic4('dlgrecording.ui')
+
 
         # Add the QRC file which compiles in some extra resources (prefs icons,
         # etc.)

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2011-03-22 16:24:04 +0000
+++ mixxx/build/features.py	2011-04-22 09:04:29 +0000
@@ -101,7 +101,7 @@
             build.env.Append(CPPDEFINES = '__COREAUDIO__')
 
     def sources(self, build):
-        return ['soundsourcecoreaudio.cpp', 
+        return ['soundsourcecoreaudio.cpp',
                 '#lib/apple/CAStreamBasicDescription.h']
 
 
@@ -291,11 +291,15 @@
                    'vinylcontrolproxy.cpp',
                    'vinylcontrolxwax.cpp',
                    'dlgprefvinyl.cpp',
-                   'vinylcontrolsignalwidget.cpp']
+                   'vinylcontrolsignalwidget.cpp',
+                   'engine/vinylcontrolcontrol.cpp']
         if build.platform_is_windows:
-            sources.append("#lib/xwax/timecoder_win32.c")
+            sources.append("#lib/xwax/timecoder_win32.cpp")
+            sources.append("#lib/xwax/lut.cpp")
         else:
             sources.append("#lib/xwax/timecoder.c")
+            sources.append("#lib/xwax/lut.c")
+
         return sources
 
 class Tonal(Feature):
@@ -414,6 +418,30 @@
                 'script/macrolistitem.cpp',
                 'script/qtscriptinterface.cpp']
 
+class PerfTools(Feature):
+    def description(self):
+        return "Google PerfTools"
+
+    def enabled(self, build):
+        build.flags['perftools'] = util.get_flags(build.env, 'perftools', 0)
+        build.flags['perftools_profiler'] = util.get_flags(build.env, 'perftools_profiler', 0)
+        if int(build.flags['perftools']):
+            return True
+        return False
+
+    def add_options(self, build, vars):
+        vars.Add("perftools", "Set to 1 to enable linking against libtcmalloc and Google's performance tools. You must install libtcmalloc from google-perftools to use this option.", 0)
+        vars.Add("perftools_profiler", "Set to 1 to enable linking against libprofiler, Google's CPU profiler. You must install libprofiler from google-perftools to use this option.", 0)
+
+    def configure(self, build, conf):
+        if not self.enabled(build):
+            return
+
+        build.env.Append(LIBS = "tcmalloc")
+
+        if int(build.flags['perftools_profiler']):
+            build.env.Append(LIBS = "profiler")
+
 class AsmLib(Feature):
     def description(self):
         return "Agner Fog\'s ASMLIB"

=== modified file 'mixxx/build/qtcreator/mixxx.pro'
--- mixxx/build/qtcreator/mixxx.pro	2010-11-11 19:10:52 +0000
+++ mixxx/build/qtcreator/mixxx.pro	2011-04-22 09:04:29 +0000
@@ -110,6 +110,7 @@
     $$UI_DIR/ui_dlgprefrecorddlg.h \
     $$UI_DIR/ui_dlgprefsounddlg.h \
     $$UI_DIR/ui_dlgprefvinyldlg.h \
+    $$UI_DIR/ui_dlgprefnovinyldlg.h \
     $$UI_DIR/ui_dlgprefnomididlg.h
 
 INCLUDEPATH += src \

=== added file 'mixxx/lib/xwax/lut.c'
--- mixxx/lib/xwax/lut.c	1970-01-01 00:00:00 +0000
+++ mixxx/lib/xwax/lut.c	2011-04-22 09:04:29 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "lut.h"
+
+/* The number of bits to form the hash, which governs the overall size
+ * of the hash lookup table, and hence the amount of chaining */
+
+#define HASH_BITS 16
+
+#define HASH(timecode) ((timecode) & ((1 << HASH_BITS) - 1))
+#define NO_SLOT ((unsigned)-1)
+
+
+/* Initialise an empty hash lookup table to store the given number
+ * of timecode -> position lookups */
+
+int lut_init(struct lut_t *lut, int nslots)
+{
+    int n, hashes;
+    size_t bytes;
+
+    hashes = 1 << HASH_BITS;
+    bytes = sizeof(struct slot_t) * nslots + sizeof(slot_no_t) * hashes;
+
+    fprintf(stderr, "Lookup table has %d hashes to %d slots"
+            " (%d slots per hash, %zuKb)\n",
+            hashes, nslots, nslots / hashes, bytes / 1024);
+
+    lut->slot = (struct slot_t*)malloc(sizeof(struct slot_t) * nslots);
+    if (lut->slot == NULL) {
+        perror("malloc");
+        return -1;
+    }
+
+    lut->table = (slot_no_t*)malloc(sizeof(slot_no_t) * hashes);
+    if (lut->table == NULL) {
+        perror("malloc");
+        return -1;
+    }
+
+    for (n = 0; n < hashes; n++)
+        lut->table[n] = NO_SLOT;
+
+    lut->avail = 0;
+
+    return 0;
+}
+
+
+void lut_clear(struct lut_t *lut)
+{
+    free(lut->table);
+}
+
+
+void lut_push(struct lut_t *lut, unsigned int timecode)
+{
+    unsigned int hash;
+    slot_no_t slot_no;
+    struct slot_t *slot;
+
+    slot_no = lut->avail++; /* take the next available slot */
+
+    slot = &lut->slot[slot_no];
+    slot->timecode = timecode;
+
+    hash = HASH(timecode);
+    slot->next = lut->table[hash];
+    lut->table[hash] = slot_no;
+}
+
+
+unsigned int lut_lookup(struct lut_t *lut, unsigned int timecode)
+{
+    unsigned int hash;
+    slot_no_t slot_no;
+    struct slot_t *slot;
+
+    hash = HASH(timecode);
+    slot_no = lut->table[hash];
+
+    while (slot_no != NO_SLOT) {
+        slot = &lut->slot[slot_no];
+        if (slot->timecode == timecode)
+            return slot_no;
+        slot_no = slot->next;
+    }
+
+    return (unsigned)-1;
+}

=== added file 'mixxx/lib/xwax/lut.cpp'
--- mixxx/lib/xwax/lut.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/lib/xwax/lut.cpp	2011-04-22 09:04:29 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "lut.h"
+
+/* The number of bits to form the hash, which governs the overall size
+ * of the hash lookup table, and hence the amount of chaining */
+
+#define HASH_BITS 16
+
+#define HASH(timecode) ((timecode) & ((1 << HASH_BITS) - 1))
+#define NO_SLOT ((unsigned)-1)
+
+
+/* Initialise an empty hash lookup table to store the given number
+ * of timecode -> position lookups */
+
+int lut_init(struct lut_t *lut, int nslots)
+{
+    int n, hashes;
+    size_t bytes;
+
+    hashes = 1 << HASH_BITS;
+    bytes = sizeof(struct slot_t) * nslots + sizeof(slot_no_t) * hashes;
+
+    fprintf(stderr, "Lookup table has %d hashes to %d slots"
+            " (%d slots per hash, %zuKb)\n",
+            hashes, nslots, nslots / hashes, bytes / 1024);
+
+    lut->slot = (struct slot_t*)malloc(sizeof(struct slot_t) * nslots);
+    if (lut->slot == NULL) {
+        perror("malloc");
+        return -1;
+    }
+
+    lut->table = (slot_no_t*)malloc(sizeof(slot_no_t) * hashes);
+    if (lut->table == NULL) {
+        perror("malloc");
+        return -1;
+    }
+
+    for (n = 0; n < hashes; n++)
+        lut->table[n] = NO_SLOT;
+
+    lut->avail = 0;
+
+    return 0;
+}
+
+
+void lut_clear(struct lut_t *lut)
+{
+    free(lut->table);
+}
+
+
+void lut_push(struct lut_t *lut, unsigned int timecode)
+{
+    unsigned int hash;
+    slot_no_t slot_no;
+    struct slot_t *slot;
+
+    slot_no = lut->avail++; /* take the next available slot */
+
+    slot = &lut->slot[slot_no];
+    slot->timecode = timecode;
+
+    hash = HASH(timecode);
+    slot->next = lut->table[hash];
+    lut->table[hash] = slot_no;
+}
+
+
+unsigned int lut_lookup(struct lut_t *lut, unsigned int timecode)
+{
+    unsigned int hash;
+    slot_no_t slot_no;
+    struct slot_t *slot;
+
+    hash = HASH(timecode);
+    slot_no = lut->table[hash];
+
+    while (slot_no != NO_SLOT) {
+        slot = &lut->slot[slot_no];
+        if (slot->timecode == timecode)
+            return slot_no;
+        slot_no = slot->next;
+    }
+
+    return (unsigned)-1;
+}

=== added file 'mixxx/lib/xwax/lut.h'
--- mixxx/lib/xwax/lut.h	1970-01-01 00:00:00 +0000
+++ mixxx/lib/xwax/lut.h	2011-04-22 09:04:29 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2009 Mark Hills <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LUT_H
+#define LUT_H
+
+typedef unsigned int slot_no_t;
+
+struct slot_t {
+    unsigned int timecode;
+    slot_no_t next; /* next slot with the same hash */
+};
+
+struct lut_t {
+    struct slot_t *slot;
+    slot_no_t *table, /* hash -> slot lookup */
+        avail; /* next available slot */
+};
+
+int lut_init(struct lut_t *lut, int nslots);
+void lut_clear(struct lut_t *lut);
+
+void lut_push(struct lut_t *lut, unsigned int timecode);
+unsigned int lut_lookup(struct lut_t *lut, unsigned int timecode);
+
+#endif

=== added file 'mixxx/lib/xwax/pitch.h'
--- mixxx/lib/xwax/pitch.h	1970-01-01 00:00:00 +0000
+++ mixxx/lib/xwax/pitch.h	2011-04-22 09:04:29 +0000
@@ -0,0 +1,71 @@
+/* 
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2, as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#ifndef PITCH_H
+#define PITCH_H
+
+/* Values for the filter concluded experimentally */
+
+#define ALPHA (1.0/512)
+#define BETA (ALPHA/1024)
+
+/* State of the pitch calculation filter */
+
+struct pitch_t {
+    float dt, x, v;
+};
+
+/* Prepare the filter for observations every dt seconds */
+
+static inline void pitch_init(struct pitch_t *p, float dt)
+{
+    p->dt = dt;
+    p->x = 0.0;
+    p->v = 0.0;
+}
+
+/* Input an observation to the filter; in the last dt seconds the
+ * position has moved by dx.
+ *
+ * Because the vinyl uses timestamps, the values for dx are discrete
+ * rather than smooth. */
+
+static inline void pitch_dt_observation(struct pitch_t *p, float dx)
+{
+    float predicted_x, predicted_v, residual_x;
+
+    predicted_x = p->x + p->v * p->dt;
+    predicted_v = p->v;
+
+    residual_x = dx - predicted_x;
+
+    p->x = predicted_x + residual_x * ALPHA;
+    p->v = predicted_v + residual_x * BETA / p->dt;
+
+    p->x -= dx; /* relative to previous */
+}
+
+/* Get the pitch after filtering */
+
+static inline float pitch_current(struct pitch_t *p)
+{
+    return p->v;
+}
+
+#endif

=== modified file 'mixxx/lib/xwax/timecoder.c'
--- mixxx/lib/xwax/timecoder.c	2009-06-28 23:57:54 +0000
+++ mixxx/lib/xwax/timecoder.c	2011-04-22 09:04:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Mark Hills <[e-mail]>
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +17,7 @@
  *
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,10 +26,8 @@
 #include "timecoder.h"
 
 #define ZERO_THRESHOLD 128
-#define SIGNAL_THRESHOLD 256
 
-#define ZERO_AVG 1024
-#define SIGNAL_AVG 256
+#define ZERO_RC 0.001 /* time constant for zero/rumble filter */
 
 #define REF_PEAKS_AVG 48 /* in wave cycles */
 
@@ -45,187 +44,201 @@
 
 /* Timecode definitions */
 
-
-#define POLARITY_NEGATIVE 0
-#define POLARITY_POSITIVE 1
-
-
-struct timecode_def_t timecode_def[] = {
-    {
-        name: "serato_2a",
-        desc: "Serato 2nd Ed., side A",
-        resolution: 1000,
-        polarity: POLARITY_POSITIVE,
-        bits: 20,
-        seed: 0x59017,
-        tap: {2, 5, 6, 7, 8, 13, 14, 16, 17},
-        ntaps: 9,
-        length: 712000,
-        safe: 707000,
-        lookup: NULL
-    },
-    {
-        name: "serato_2b",
-        desc: "Serato 2nd Ed., side B",
-        seed: 0x8f3c6,
-        resolution: 1000,
-        polarity: POLARITY_POSITIVE,
-        bits: 20,
-        tap: {3, 4, 6, 7, 12, 13, 14, 15, 18}, /* reverse of side A */
-        ntaps: 9,
-        length: 922000,
-        safe: 917000,
-        lookup: NULL
-    },
-    {
-        name: "serato_cd",
-        desc: "Serato CD",
-        resolution: 1000,
-        polarity: POLARITY_POSITIVE,
-        bits: 20,
-        seed: 0xd8b40,
-        tap: {2, 4, 6, 8, 10, 11, 14, 16, 17},
-        ntaps: 9,
-        length: 910000,
-        safe: 900000,
-        lookup: NULL
-    },
-    {
-        name: "traktor_a",
-        desc: "Traktor Scratch, side A",
-        resolution: 2000,
-        polarity: POLARITY_POSITIVE,
-        bits: 23,
-        seed: 0x134503,
-        tap: {6, 12, 18},
-        ntaps: 3,
-        length: 1500000,
-        safe: 1480000,
-        lookup: NULL
-    },
-    {
-        name: "traktor_b",
-        desc: "Traktor Scratch, side B",
-        resolution: 2000,
-        polarity: POLARITY_POSITIVE,
-        bits: 23,
-        seed: 0x32066c,
-        tap: {6, 12, 18},
-        ntaps: 3,
-        length: 2110000,
-        safe: 2090000,
-        lookup: NULL
-    },
-    {
-        name: NULL
+#define SWITCH_PHASE 0x1 /* tone phase difference of 270 (not 90) degrees */
+#define SWITCH_PRIMARY 0x2 /* use left channel (not right) as primary */
+#define SWITCH_POLARITY 0x4 /* read bit values in negative (not positive) */
+
+
+static struct timecode_def_t timecode_def[] = {
+    {
+        .name = "serato_2a",
+        .desc = "Serato 2nd Ed., side A",
+        .resolution = 1000,
+        .flags = 0,
+        .bits = 20,
+        .seed = 0x59017,
+        .taps = 0x361e4,
+        .length = 712000,
+        .safe = 625000,
+        .lookup = false
+    },
+    {
+        .name = "serato_2b",
+        .desc = "Serato 2nd Ed., side B",
+        .resolution = 1000,
+        .flags = 0,
+        .bits = 20,
+        .seed = 0x8f3c6,
+        .taps = 0x4f0d8, /* reverse of side A */
+        .length = 922000,
+        .safe = 905000,
+        .lookup = false
+    },
+    {
+        .name = "serato_cd",
+        .desc = "Serato CD",
+        .resolution = 1000,
+        .flags = 0,
+        .bits = 20,
+        .seed = 0xd8b40,
+        .taps = 0x34d54,
+        .length = 950000,
+        .safe = 940000,
+        .lookup = false
+    },
+    {
+        .name = "traktor_a",
+        .desc = "Traktor Scratch, side A",
+        .resolution = 2000,
+        .flags = SWITCH_PRIMARY | SWITCH_POLARITY | SWITCH_PHASE,
+        .bits = 23,
+        .seed = 0x134503,
+        .taps = 0x041040,
+        .length = 1500000,
+        .safe = 1463000,
+        .lookup = false        
+    },
+    {
+        .name = "traktor_b",
+        .desc = "Traktor Scratch, side B",
+        .resolution = 2000,
+        .flags = SWITCH_PRIMARY | SWITCH_POLARITY | SWITCH_PHASE,
+        .bits = 23,
+        .seed = 0x32066c,
+        .taps = 0x041040, /* same as side A */
+        .length = 2110000,
+        .safe = 2068000,
+        .lookup = false
+    },
+    {
+        .name = "mixvibes_v2",
+        .desc = "MixVibes V2",
+        .resolution = 1300,
+        .flags = SWITCH_PHASE,
+        .bits = 20,
+        .seed = 0x22c90,
+        .taps = 0x00008,
+        .length = 950000,
+        .safe = 923000,
+        .lookup = false
+    },
+    {
+        .name = "mixvibes_7inch",
+        .desc = "MixVibes 7\"",
+        .resolution = 1300,
+        .flags = SWITCH_PHASE,
+        .bits = 20,
+        .seed = 0x22c90,
+        .taps = 0x00008,
+        .length = 312000,
+        .safe = 310000,
+        .lookup = false
+    },
+    {
+        .name = NULL
     }
 };
 
 
-//struct timecode_def_t *def;
-
-
 /* Linear Feeback Shift Register in the forward direction. New values
  * are generated at the least-significant bit. */
 
-static inline int lfsr(unsigned int code, struct timecoder_t *timecoder)
-{
-    unsigned int r;
-    char s, n;
-
-    r = code & 1;
-
-    for(n = 0; n < timecoder->tc_table->ntaps; n++) {
-        s = *(timecoder->tc_table->tap + n);
-        r += (code & (1 << s)) >> s;
-    }
-    
-    return r & 0x1;
-}
-
-
-/* Linear Feeback Shift Register in the reverse direction. New values
- * are generated at the most-significant bit. */
-
-static inline int lfsr_rev(unsigned int code, struct timecoder_t *timecoder)
-{
-    unsigned int r;
-    char s, n;
-
-    r = (code & (1 << (timecoder->tc_table->bits - 1))) >> (timecoder->tc_table->bits - 1);
-
-    for(n = 0; n < timecoder->tc_table->ntaps; n++) {
-        s = *(timecoder->tc_table->tap + n) - 1;
-        r += (code & (1 << s)) >> s;
-    }
-    
-    return r & 0x1;
-}
-
-
-/* Setup globally, for a chosen timecode definition */
-
-int timecoder_build_lookup(char *timecode_name, struct timecoder_t *timecoder) {
-    unsigned int n, current;
-
+static inline bits_t lfsr(bits_t code, bits_t taps)
+{
+    bits_t taken;
+    int xrs;
+
+    taken = code & taps;
+    xrs = 0;
+    while (taken != 0x0) {
+        xrs += taken & 0x1;
+        taken >>= 1;
+    }
+
+    return xrs & 0x1;
+}
+
+
+static inline bits_t fwd(bits_t current, struct timecode_def_t *def)
+{
+    bits_t l;
+
+    /* New bits are added at the MSB; shift right by one */
+
+    l = lfsr(current, def->taps | 0x1);
+    return (current >> 1) | (l << (def->bits - 1));
+}
+
+
+static inline bits_t rev(bits_t current, struct timecode_def_t *def)
+{
+    bits_t l, mask;
+
+    /* New bits are added at the LSB; shift left one and mask */
+
+    mask = (1 << def->bits) - 1;
+    l = lfsr(current, (def->taps >> 1) | (0x1 << (def->bits - 1)));
+    return ((current << 1) & mask) | l;
+}
+
+
+static struct timecode_def_t* find_definition(const char *name)
+{
     struct timecode_def_t *def;
+
     def = &timecode_def[0];
-
-    while(def->name) {
-        if(!strcmp(def->name, timecode_name))
-            break;
+    while (def->name) {
+        if (!strcmp(def->name, name))
+            return def;
         def++;
     }
-
-    if(!def->name) {
-        fprintf(stderr, "Timecode definition '%s' is not known.\n",
-                timecode_name);
-        return -1;
-    }
-
-    //Copy the lookup table stuff
-    if (timecoder->tc_table == NULL) {
-        timecoder->tc_table = malloc(sizeof(struct timecode_def_t));
-    }
-    memcpy(timecoder->tc_table, def, sizeof(struct timecode_def_t));
-
-    fprintf(stderr, "Allocating %d slots (%zuKb) for %d bit timecode (%s)\n",
-            2 << timecoder->tc_table->bits, (2 << timecoder->tc_table->bits) * sizeof(unsigned int) / 1024,
-            timecoder->tc_table->bits, timecoder->tc_table->desc);
-
-    timecoder->tc_table->lookup = malloc((2 << timecoder->tc_table->bits) * sizeof(unsigned int));
-    if(!timecoder->tc_table->lookup) {
-        perror("malloc");
+    return NULL;
+}
+
+
+/* Where necessary, build the lookup table required for this timecode */
+
+static int build_lookup(struct timecode_def_t *def)
+{
+    unsigned int n;
+    bits_t current, last;
+
+    if (def->lookup)
         return 0;
-    }
-   
-    for(n = 0; n < ((unsigned int)2 << timecoder->tc_table->bits); n++)
-        timecoder->tc_table->lookup[n] = -1;
-    
-    current = timecoder->tc_table->seed;
-    
-    for(n = 0; n < timecoder->tc_table->length; n++) {
-        if(timecoder->tc_table->lookup[current] != -1) {
-            fprintf(stderr, "Timecode has wrapped; finishing here.\n");
-            return -1;
-        }
-        
-        timecoder->tc_table->lookup[current] = n;
-        current = (current >> 1) + (lfsr(current, timecoder) << (timecoder->tc_table->bits - 1));
-        //printf("n=%d\n", n);
-    }
+
+    fprintf(stderr, "Building LUT for %d bit %dHz timecode (%s)\n",
+            def->bits, def->resolution, def->desc);
+
+    if (lut_init(&def->lut, def->length) == -1)
+	return -1;
+
+    current = def->seed;
+    
+    for (n = 0; n < def->length; n++) {
+        /* timecode must not wrap */
+        assert(lut_lookup(&def->lut, current) == (unsigned)-1);
+        lut_push(&def->lut, current);
+        last = current;
+        current = fwd(current, def);
+        assert(rev(current, def) == last);
+    }
+
+    def->lookup = true;
     
     return 0;    
 }
 
 
-/* Free the timecoder lookup table when it is no longer needed */
-
-void timecoder_free_lookup(struct timecoder_t* timecoder) {
-    if (timecoder->tc_table->lookup)
-    {
-        free(timecoder->tc_table->lookup);
-        timecoder->tc_table->lookup = NULL;
+/* Free the timecoder lookup tables when they are no longer needed */
+
+void timecoder_free_lookup(void) {
+    struct timecode_def_t *def;
+
+    def = &timecode_def[0];
+    while (def->name) {
+        if (def->lookup)
+            lut_clear(&def->lut);
+        def++;
     }
 }
 
@@ -234,40 +247,43 @@
 {
     ch->positive = 0;
     ch->zero = 0;
-    ch->crossing_ticker = 0;
 }
 
 
-/* Initialise a timecode decoder */
+/* Initialise a timecode decoder at the given reference speed */
 
-void timecoder_init(struct timecoder_t *tc)
+int timecoder_init(struct timecoder_t *tc, const char *def_name, double speed,
+		   unsigned int sample_rate)
 {
-    int c;
+    /* A definition contains a lookup table which can be shared
+     * across multiple timecoders */
+
+    tc->def = find_definition(def_name);
+    if (tc->def == NULL) {
+        fprintf(stderr, "Timecode definition '%s' is not known.\n", def_name);
+        return -1;
+    }
+    if (build_lookup(tc->def) == -1)
+        return -1;
+    tc->speed = speed;
+
+    tc->dt = 1.0 / sample_rate;
+    tc->zero_alpha = tc->dt / (ZERO_RC + tc->dt);
 
     tc->forwards = 1;
-    tc->rate = TIMECODER_RATE;
-
-    tc->half_peak = 0;
-    tc->wave_peak = 0;
-    tc->ref_level = -1;
-    tc->signal_level = 0;
-
-    init_channel(&tc->mono);
-    for(c = 0; c < TIMECODER_CHANNELS; c++)
-        init_channel(&tc->channel[c]);
-        
-    tc->crossings = 0;
-    tc->pitch_ticker = 0;
-
+    init_channel(&tc->primary);
+    init_channel(&tc->secondary);
+    pitch_init(&tc->pitch, tc->dt);
+
+    tc->ref_level = 32768.0;
     tc->bitstream = 0;
     tc->timecode = 0;
     tc->valid_counter = 0;
     tc->timecode_ticker = 0;
 
     tc->mon = NULL;
-    tc->log_fd = -1;
-    
-    tc->tc_table = NULL;
+
+    return 0;
 }
 
 
@@ -283,13 +299,17 @@
  * display of the incoming audio. Initialise one for the given
  * timecoder */
 
-void timecoder_monitor_init(struct timecoder_t *tc, int size, int scale)
+int timecoder_monitor_init(struct timecoder_t *tc, int size)
 {
     tc->mon_size = size;
-    tc->mon_scale = scale;
     tc->mon = malloc(SQ(tc->mon_size));
+    if (tc->mon == NULL) {
+        perror("malloc");
+        return -1;
+    }
     memset(tc->mon, 0, SQ(tc->mon_size));
     tc->mon_counter = 0;
+    return 0;
 }
 
 
@@ -297,300 +317,212 @@
 
 void timecoder_monitor_clear(struct timecoder_t *tc)
 {
-    if(tc->mon) {
+    if (tc->mon) {
         free(tc->mon);
         tc->mon = NULL;
     }
 }
 
 
-static int detect_zero_crossing(struct timecoder_channel_t *ch,
-                                signed short v, int rate)
+static void detect_zero_crossing(struct timecoder_channel_t *ch,
+                                 signed int v, float alpha)
 {
-    int swapped;
-
     ch->crossing_ticker++;
 
-    swapped = 0;
-    if(v >= ch->zero + ZERO_THRESHOLD && !ch->positive) {
-        swapped = 1;
+    ch->swapped = 0;
+    if (v > ch->zero + ZERO_THRESHOLD && !ch->positive) {
+        ch->swapped = 1;
         ch->positive = 1;
         ch->crossing_ticker = 0;
-    } else if(v < ch->zero - ZERO_THRESHOLD && ch->positive) {
-        swapped = 1;
+    } else if (v < ch->zero - ZERO_THRESHOLD && ch->positive) {
+        ch->swapped = 1;
         ch->positive = 0;
         ch->crossing_ticker = 0;
     }
     
-    ch->zero += (v - ch->zero) * ZERO_AVG / rate;
+    ch->zero += alpha * (v - ch->zero);
+}
+
+
+/* Plot the given sample value in the monitor (scope) */
+
+static void update_monitor(struct timecoder_t *tc, signed int x, signed int y)
+{
+    int px, py, p;
+    float v, w;
+
+    if (!tc->mon)
+        return;
+
+    /* Decay the pixels already in the montior */
+        
+    if (++tc->mon_counter % MONITOR_DECAY_EVERY == 0) {
+        for (p = 0; p < SQ(tc->mon_size); p++) {
+            if (tc->mon[p])
+                tc->mon[p] = tc->mon[p] * 7 / 8;
+        }
+    }
+        
+    v = (float)x / tc->ref_level / 2;
+    w = (float)y / tc->ref_level / 2;
+        
+    px = tc->mon_size / 2 + (v * tc->mon_size / 2);
+    py = tc->mon_size / 2 + (w * tc->mon_size / 2);
+
+    /* Set the pixel value to white */
+            
+    if (px > 0 && px < tc->mon_size && py > 0 && py < tc->mon_size)
+        tc->mon[py * tc->mon_size + px] = 0xff;
+}
+
+
+/* Process a single bitstream reading */
+
+static void process_bitstream(struct timecoder_t *tc, signed int m)
+{
+    bits_t b;
+
+    b = m > tc->ref_level;
+
+    /* Add it to the bitstream, and work out what we were expecting
+     * (timecode). */
+
+    /* tc->bitstream is always in the order it is physically placed on
+     * the vinyl, regardless of the direction. */
+
+    if (tc->forwards) {
+	tc->timecode = fwd(tc->timecode, tc->def);
+	tc->bitstream = (tc->bitstream >> 1)
+	    + (b << (tc->def->bits - 1));
+
+    } else {
+	bits_t mask;
+
+	mask = ((1 << tc->def->bits) - 1);
+	tc->timecode = rev(tc->timecode, tc->def);
+	tc->bitstream = ((tc->bitstream << 1) & mask) + b;
+    }
+
+    if (tc->timecode == tc->bitstream)
+	tc->valid_counter++;
+    else {
+	tc->timecode = tc->bitstream;
+	tc->valid_counter = 0;
+    }
+
+    /* Take note of the last time we read a valid timecode */
     
-    return swapped;
+    tc->timecode_ticker = 0;
+
+    /* Adjust the reference level based on this new peak */
+
+    tc->ref_level = (tc->ref_level * (REF_PEAKS_AVG - 1) + m) / REF_PEAKS_AVG;
+
+#ifdef DEBUG_BITSTREAM
+    fprintf(stderr, "%+6d zero, %+6d (ref %+6d)\t= %d%c (%5d)\n",
+	    tc->primary.zero,
+	    m,
+	    tc->ref_level,
+	    b,
+	    tc->valid_counter == 0 ? 'x' : ' ',
+	    tc->valid_counter);
+#endif
+}
+
+
+/* Process a single sample from the incoming audio */
+
+static void process_sample(struct timecoder_t *tc,
+			   signed int primary, signed int secondary)
+{
+    signed int m; /* pcm sample, sum of two shorts */
+
+    detect_zero_crossing(&tc->primary, primary, tc->zero_alpha);
+    detect_zero_crossing(&tc->secondary, secondary, tc->zero_alpha);
+
+    m = abs(primary - tc->primary.zero);
+
+    /* If an axis has been crossed, use the direction of the crossing
+     * to work out the direction of the vinyl */
+
+    if (tc->primary.swapped) {
+	tc->forwards = (tc->primary.positive != tc->secondary.positive);
+	if (tc->def->flags & SWITCH_PHASE)
+	    tc->forwards = !tc->forwards;
+    } if (tc->secondary.swapped) {
+	tc->forwards = (tc->primary.positive == tc->secondary.positive);
+	if (tc->def->flags & SWITCH_PHASE)
+	    tc->forwards = !tc->forwards;
+    }
+
+    /* If any axis has been crossed, register movement using the pitch
+     * counters */
+
+    if (!tc->primary.swapped && !tc->secondary.swapped)
+	pitch_dt_observation(&tc->pitch, 0.0);
+    else {
+	float dx;
+
+	dx = 1.0 / tc->def->resolution / 4;
+	if (!tc->forwards)
+	    dx = -dx;
+	pitch_dt_observation(&tc->pitch, dx);
+    }
+
+    /* If we have crossed the primary channel in the right polarity,
+     * it's time to read off a timecode 0 or 1 value */
+
+    if (tc->secondary.swapped &&
+       tc->primary.positive == ((tc->def->flags & SWITCH_POLARITY) == 0))
+    {
+	process_bitstream(tc, m);
+    }
+
+    tc->timecode_ticker++;
 }
 
 
 /* Submit and decode a block of PCM audio data to the timecoder */
 
-int timecoder_submit(struct timecoder_t *tc, signed short *pcm, int samples)
+void timecoder_submit(struct timecoder_t *tc, const signed short *pcm, size_t npcm)
 {
-    int b, l, /* bitstream and timecode bits */
-        s, c,
-        x, y, p, /* monitor coordinates */
-        v,
-        offset,
-        swapped,
-        monitor_centre;
-    signed short w; /* pcm sample values */
-    unsigned int mask;
-    
-    b = 0;
-    l = 0;
-    
-    mask = ((1 << tc->tc_table->bits) - 1);
-    monitor_centre = tc->mon_size / 2;
-
-    offset = 0;
-
-    for(s = 0; s < samples; s++) {
-        
-        for(c = 0; c < TIMECODER_CHANNELS; c++)
-            detect_zero_crossing(&tc->channel[c], pcm[offset + c], tc->rate);
-
-        /* Read from the mono channel */
-        
-        v = pcm[offset] + pcm[offset + 1];
-        swapped = detect_zero_crossing(&tc->mono, v, tc->rate);
-
-        /* If a sign change in the (zero corrected) audio has
-         * happened, log the peak information */
-        
-        if(swapped) {
-            
-            /* Work out whether half way through a cycle we are
-             * looking for the wave to be positive or negative */
-            
-            if(tc->mono.positive == (tc->tc_table->polarity ^ tc->forwards)) {
-                
-                /* Entering the second half of a wave cycle */
-                
-                tc->half_peak = tc->wave_peak;
-                
-            } else {
-                
-                /* Completed a full wave cycle, so time to analyse the
-                 * level and work out whether it's a 1 or 0 */
-                
-                b = tc->wave_peak + tc->half_peak > tc->ref_level;
-                
-                /* Log binary timecode */
-                
-                if(tc->log_fd != -1)
-                    write(tc->log_fd, b ? "1" : "0", 1);
-                
-                /* Add it to the bitstream, and work out what we were
-                 * expecting (timecode). */
-                
-                /* tc->bitstream is always in the order it is
-                 * physically placed on the vinyl, regardless of the
-                 * direction. */
-                
-                if(tc->forwards) {
-                    l = lfsr(tc->timecode, tc);
-                    
-                    tc->bitstream = (tc->bitstream >> 1)
-                        + (b << (tc->tc_table->bits - 1));
-                    
-                    tc->timecode = (tc->timecode >> 1)
-                        + (l << (tc->tc_table->bits - 1));
-                    
-                } else {
-                    l = lfsr_rev(tc->timecode, tc);
-                    
-                    tc->bitstream = ((tc->bitstream << 1) & mask) + b;
-                    tc->timecode = ((tc->timecode << 1) & mask) + l;
-                }
-                
-                if(b == l) {
-                    tc->valid_counter++;
-                } else {
-                    tc->timecode = tc->bitstream;
-                    tc->valid_counter = 0;
-                }
-                
-                /* Take note of the last time we read a valid timecode */
-                
-                tc->timecode_ticker = 0;
-                
-                /* Adjust the reference level based on the peaks seen
-                 * in this cycle */
-                
-                if(tc->ref_level == -1)
-                    tc->ref_level = tc->half_peak + tc->wave_peak;
-                else {
-                    tc->ref_level = (tc->ref_level * (REF_PEAKS_AVG - 1)
-                                     + tc->half_peak + tc->wave_peak)
-                        / REF_PEAKS_AVG;
-                }
-                
-            }
-            
-            /* Calculate the immediate direction from phase difference,
-             * based on the last channel to cross zero */
-
-            if(tc->channel[0].crossing_ticker > tc->channel[1].crossing_ticker)
-                tc->forwards = 1;
-            else
-                tc->forwards = 0;
-
-            if(tc->forwards)
-                tc->crossings++;
-            else
-                tc->crossings--;
-            
-            tc->pitch_ticker += tc->crossing_ticker;
-            tc->crossing_ticker = 0;
-            tc->wave_peak = 0;
-            
-        } /* swapped */
-        
-        tc->crossing_ticker++;
-        tc->timecode_ticker++;
-        
-        /* Find the zero-normalised sample of the peak value from
-         * the input */
-        
-        w = abs(v - tc->mono.zero);
-        if(w > tc->wave_peak)
-            tc->wave_peak = w;
-        
-        /* Take a rolling average of zero and signal level */
-
-        tc->signal_level += (w - tc->signal_level) * SIGNAL_AVG / tc->rate;
-
-        /* Update the monitor to add the incoming sample */
-        
-        if(tc->mon) {
-            
-            /* Decay the pixels already in the montior */
-            
-            if(++tc->mon_counter % MONITOR_DECAY_EVERY == 0) {
-                for(p = 0; p < SQ(tc->mon_size); p++) {
-                    if(tc->mon[p])
-                        tc->mon[p] = tc->mon[p] * 7 / 8;
-                }
-            }
-            
-            v = pcm[offset]; /* first channel */
-            w = pcm[offset + 1]; /* second channel */
-            
-            x = monitor_centre + (v * tc->mon_size * tc->mon_scale / 32768);
-            y = monitor_centre + (w * tc->mon_size * tc->mon_scale / 32768);
-            
-            /* Set the pixel value to white */
-            
-            if(x > 0 && x < tc->mon_size && y > 0 && y < tc->mon_size)
-                tc->mon[y * tc->mon_size + x] = 0xff;
+    while (npcm--) {
+	signed int primary, secondary;
+
+        if (tc->def->flags & SWITCH_PRIMARY) {
+            primary = pcm[0];
+            secondary = pcm[1];
+        } else {
+            primary = pcm[1];
+            secondary = pcm[0];
         }
-        
-        offset += TIMECODER_CHANNELS;
-        
-    } /* for each sample */
-    
-    /* Print debugging information */
-    
-#if 0
-    fprintf(stderr, "%+6d +/%4d -/%4d (%4d,%4d)\t= %d (%d) %c %d"
-            "\t[crossings: %d %d]",
-            tc->mono.zero,
-            tc->half_peak,
-            tc->wave_peak,
-            tc->ref_level >> 1,
-            tc->signal_level,
-            b, l, b == l ? ' ' : 'x',
-            tc->valid_counter,
-            tc->crossings,
-            tc->pitch_ticker);
-
-    if(tc->pitch_ticker)
-        fprintf(stderr, " = %d", tc->rate * tc->crossings / tc->pitch_ticker);
-
-    fputc('\n', stderr);
-#endif
-
-    return 0;
-}
-
-
-/* Return the timecode pitch, based on cycles of the sine wave. This
- * function can only be called by one context, at it resets the state
- * of the counter in the timecoder. */
-
-int timecoder_get_pitch(struct timecoder_t *tc, float *pitch)
-{
-    /* Let the caller know if there's no data to gather pitch from */
-
-    if(tc->crossings == 0)
-        return -1;
-
-    /* Value of tc->crossings may be negative in reverse */
-    
-    *pitch = tc->rate * (float)tc->crossings / tc->pitch_ticker
-        / (tc->tc_table->resolution * 2);
-
-    tc->crossings = 0;
-    tc->pitch_ticker = 0;
-
-    return 0;
+
+	process_sample(tc, primary, secondary);
+
+        update_monitor(tc, pcm[0], pcm[1]);
+        pcm += TIMECODER_CHANNELS;
+    }
 }
 
 
 /* Return the known position in the timecode, or -1 if not known. If
  * two few bits have been error-checked, then this also counts as
- * invalid. If 'when' is given, return the time, in input samples since
- * this value was read. */
+ * invalid. If 'when' is given, return the time, in seconds since this
+ * value was read. */
 
-signed int timecoder_get_position(struct timecoder_t *tc, int *when)
+signed int timecoder_get_position(struct timecoder_t *tc, float *when)
 {
     signed int r;
 
-    if(tc->valid_counter > VALID_BITS) {
-        r = tc->tc_table->lookup[tc->bitstream];
+    if (tc->valid_counter > VALID_BITS) {
+        r = lut_lookup(&tc->def->lut, tc->bitstream) / tc->speed;
 
-        if(r >= 0) {
-            if(when) 
-                *when = tc->timecode_ticker;
+        if (r >= 0) {
+            if (when)
+                *when = tc->timecode_ticker * tc->dt;
             return r;
         }
     }
     
     return -1;
 }
-
-
-/* Return non-zero if there is any timecode signal available */
-
-int timecoder_get_alive(struct timecoder_t *tc)
-{
-    if(tc->signal_level < SIGNAL_THRESHOLD)
-        return 0;
-    
-    return 1;
-}
-
-
-/* Return the last 'safe' timecode value on the record. Beyond this
- * value, we probably want to ignore the timecode values, as we will
- * hit the label of the record. */
-
-unsigned int timecoder_get_safe(struct timecoder_t *tc)
-{
-    return tc->tc_table->safe;
-}
-
-
-/* Return the resolution of the timecode. This is the number of bits
- * per second, which corresponds to the frequency of the sine wave */
-
-int timecoder_get_resolution(struct timecoder_t *tc)
-{
-    return tc->tc_table->resolution;
-}

=== modified file 'mixxx/lib/xwax/timecoder.h'
--- mixxx/lib/xwax/timecoder.h	2009-06-28 23:57:54 +0000
+++ mixxx/lib/xwax/timecoder.h	2011-04-22 09:04:29 +0000
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2008 Mark Hills <[e-mail]>
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,80 +20,118 @@
 #ifndef TIMECODER_H
 #define TIMECODER_H
 
+#ifndef _MSC_VER
+#include <stdbool.h>
+#endif
+
+/* #include "device.h" */
+#include "lut.h"
+#include "pitch.h"
+
 #define TIMECODER_CHANNELS 2
-#define TIMECODER_RATE 44100 //Default rate - Albert
-
-#define MAX_BITS 32 /* bits in an int */
+
+
+typedef unsigned int bits_t;
+
 
 struct timecode_def_t {
     char *name, *desc;
     int bits, /* number of bits in string */
         resolution, /* wave cycles per second */
-        tap[MAX_BITS], ntaps, /* LFSR taps */
-        polarity; /* cycle begins POLARITY_POSITIVE or POLARITY_NEGATIVE */
-    unsigned int seed, /* LFSR value at timecode zero */
-        length, /* in cycles */
+        flags;
+    bits_t seed, /* LFSR value at timecode zero */
+        taps; /* central LFSR taps, excluding end taps */
+    unsigned int length, /* in cycles */
         safe; /* last 'safe' timecode number (for auto disconnect) */
-    signed int *lookup; /* pointer to built lookup table */
+    bool lookup; /* true if lut has been generated */
+    struct lut_t lut;
 };
 
+
 struct timecoder_channel_t {
-    int positive; /* wave is in positive part of cycle */
+    int positive, /* wave is in positive part of cycle */
+	swapped; /* wave recently swapped polarity */
     signed int zero;
-    int crossing_ticker; /* samples since we last crossed zero */
+    unsigned int crossing_ticker; /* samples since we last crossed zero */
 };
 
 
 struct timecoder_t {
-    int forwards, rate;
-
-    /* Signal levels */
-
-    signed int signal_level, half_peak, wave_peak, ref_level;
-    struct timecoder_channel_t mono, channel[TIMECODER_CHANNELS];
+    struct timecode_def_t *def;
+    double speed;
+
+    /* Precomputed values */
+
+    float dt, zero_alpha;
 
     /* Pitch information */
 
-    int crossings, /* number of zero crossings */
-        pitch_ticker, /* number of samples from which crossings counted */
-        crossing_ticker; /* stored for incrementing pitch_ticker */
+    int forwards;
+    struct timecoder_channel_t primary, secondary;
+    struct pitch_t pitch;
 
     /* Numerical timecode */
 
-    unsigned int bitstream, /* actual bits from the record */
+    signed int ref_level;
+    bits_t bitstream, /* actual bits from the record */
         timecode; /* corrected timecode */
-    int valid_counter, /* number of successful error checks */
+    unsigned int valid_counter, /* number of successful error checks */
         timecode_ticker; /* samples since valid timecode was read */
 
     /* Feedback */
 
     unsigned char *mon; /* x-y array */
-    int mon_size, mon_counter, mon_scale,
-        log_fd; /* optional file descriptor to log to, or -1 for none */
-        
-    struct timecode_def_t *tc_table;
+    int mon_size, mon_counter;
 };
 
 
-/* Building the lookup table is global. Need a good way to share
- * lookup tables soon, so we can use a different timecode on 
- * each timecoder, and switch between them. */
-
-int timecoder_build_lookup(char *timecode_name, struct timecoder_t *timecoder);
-void timecoder_free_lookup(struct timecoder_t *timecoder);
-
-void timecoder_init(struct timecoder_t *tc);
+void timecoder_free_lookup(void);
+
+int timecoder_init(struct timecoder_t *tc, const char *def_name, double speed,
+                   unsigned int sample_rate);
 void timecoder_clear(struct timecoder_t *tc);
 
-void timecoder_monitor_init(struct timecoder_t *tc, int size, int scale);
+int timecoder_monitor_init(struct timecoder_t *tc, int size);
 void timecoder_monitor_clear(struct timecoder_t *tc);
 
-int timecoder_submit(struct timecoder_t *tc, signed short *aud, int samples);
-
-int timecoder_get_pitch(struct timecoder_t *tc, float *pitch);
-signed int timecoder_get_position(struct timecoder_t *tc, int *when);
-int timecoder_get_alive(struct timecoder_t *tc);
-unsigned int timecoder_get_safe(struct timecoder_t *tc);
-int timecoder_get_resolution(struct timecoder_t *tc);
+void timecoder_submit(struct timecoder_t *tc, const signed short *pcm, size_t npcm);
+
+signed int timecoder_get_position(struct timecoder_t *tc, float *when);
+
+
+/* Return the pitch relative to reference playback speed */
+
+static inline float timecoder_get_pitch(struct timecoder_t *tc)
+{
+    return pitch_current(&tc->pitch) / tc->speed;
+}
+
+
+/* The last 'safe' timecode value on the record. Beyond this value, we
+ * probably want to ignore the timecode values, as we will hit the
+ * label of the record. */
+
+static inline unsigned int timecoder_get_safe(struct timecoder_t *tc)
+{
+    return tc->def->safe;
+}
+
+
+/* The resolution of the timecode. This is the number of bits per
+ * second at reference playback speed */
+
+static inline double timecoder_get_resolution(struct timecoder_t *tc)
+{
+    return tc->def->resolution * tc->speed;
+}
+
+
+/* The number of revolutions per second of the timecode vinyl,
+ * used only for visual display */
+
+static inline double timecoder_revs_per_sec(struct timecoder_t *tc)
+{
+    return (33.0 + 1.0 / 3) * tc->speed / 60;
+}
 
 #endif

=== renamed file 'mixxx/lib/xwax/timecoder_win32.c' => 'mixxx/lib/xwax/timecoder_win32.cpp'
--- mixxx/lib/xwax/timecoder_win32.c	2009-08-06 06:36:18 +0000
+++ mixxx/lib/xwax/timecoder_win32.cpp	2011-04-22 09:04:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Mark Hills <[e-mail]>
+ * Copyright (C) 2010 Mark Hills <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,18 +17,19 @@
  *
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <unistd.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
 
 #include "timecoder.h"
 
 #define ZERO_THRESHOLD 128
-#define SIGNAL_THRESHOLD 256
 
-#define ZERO_AVG 1024
-#define SIGNAL_AVG 256
+#define ZERO_RC 0.001 /* time constant for zero/rumble filter */
 
 #define REF_PEAKS_AVG 48 /* in wave cycles */
 
@@ -45,75 +46,95 @@
 
 /* Timecode definitions */
 
-
-#define POLARITY_NEGATIVE 0
-#define POLARITY_POSITIVE 1
-
-struct timecode_def_t timecode_def[] = {
+#define SWITCH_PHASE 0x1 /* tone phase difference of 270 (not 90) degrees */
+#define SWITCH_PRIMARY 0x2 /* use left channel (not right) as primary */
+#define SWITCH_POLARITY 0x4 /* read bit values in negative (not positive) */
+
+
+static struct timecode_def_t timecode_def[] = {
     {
         "serato_2a",
         "Serato 2nd Ed., side A",
         20,
-        1000,        
-        {2, 5, 6, 7, 8, 13, 14, 16, 17},
-        9,
-        POLARITY_POSITIVE,
+        1000,
+        0,
         0x59017,
+        0x361e4,
         712000,
-        707000,
-        NULL
+        625000,
+        false
     },
     {
         "serato_2b",
         "Serato 2nd Ed., side B",
         20,
         1000,
-        {3, 4, 6, 7, 12, 13, 14, 15, 18}, /* reverse of side A */
-        9,
-        POLARITY_POSITIVE,
+        0,
         0x8f3c6,
+        0x4f0d8, /* reverse of side A */
         922000,
-        917000,
-        NULL
+        905000,
+        false
     },
     {
         "serato_cd",
         "Serato CD",
         20,
         1000,
-        {2, 4, 6, 8, 10, 11, 14, 16, 17},
-        9,
-        POLARITY_POSITIVE,
+        0,
         0xd8b40,
-        910000,
-        900000,
-        NULL
+        0x34d54,
+        950000,
+        940000,
+        false
     },
     {
         "traktor_a",
         "Traktor Scratch, side A",
         23,
         2000,
-        {6, 12, 18},
-        3,
-        POLARITY_NEGATIVE,
+        SWITCH_PRIMARY | SWITCH_POLARITY | SWITCH_PHASE,
         0x134503,
+        0x041040,
         1500000,
-        1480000,
-        NULL
+        1463000,
+        false        
     },
     {
         "traktor_b",
         "Traktor Scratch, side B",
         23,
-        2000,        
-        {6, 12, 18},
-        3,
-        POLARITY_NEGATIVE,
+        2000,
+        SWITCH_PRIMARY | SWITCH_POLARITY | SWITCH_PHASE,
         0x32066c,
+        0x041040, /* same as side A */
         2110000,
-        2090000,
-        NULL
+        2068000,
+        false
+    },
+    {
+        "mixvibes_v2",
+        "MixVibes V2",
+        20,
+        1300,
+        SWITCH_PHASE,
+        0x22c90,
+        0x00008,
+        950000,
+        923000,
+        false
+    },
+    {
+        "mixvibes_7inch",
+        "MixVibes 7\"",
+        20,
+        1300,
+        SWITCH_PHASE,
+        0x22c90,
+        0x00008,
+        312000,
+        310000,
+        false
     },
     {
         NULL
@@ -121,110 +142,105 @@
 };
 
 
-//struct timecode_def_t *def;
-
-
 /* Linear Feeback Shift Register in the forward direction. New values
  * are generated at the least-significant bit. */
 
-static int lfsr(unsigned int code, struct timecoder_t *timecoder)
-{
-    unsigned int r;
-    char s, n;
-
-    r = code & 1;
-
-    for(n = 0; n < timecoder->tc_table->ntaps; n++) {
-        s = *(timecoder->tc_table->tap + n);
-        r += (code & (1 << s)) >> s;
-    }
-    
-    return r & 0x1;
-}
-
-
-/* Linear Feeback Shift Register in the reverse direction. New values
- * are generated at the most-significant bit. */
-
-static /* inline */ int lfsr_rev(unsigned int code, struct timecoder_t *timecoder) // inline causes compile failure on MSVC++ 2005 EE
-{
-    unsigned int r;
-    char s, n;
-
-    r = (code & (1 << (timecoder->tc_table->bits - 1))) >> (timecoder->tc_table->bits - 1);
-
-    for(n = 0; n < timecoder->tc_table->ntaps; n++) {
-        s = *(timecoder->tc_table->tap + n) - 1;
-        r += (code & (1 << s)) >> s;
-    }
-    
-    return r & 0x1;
-}
-
-
-/* Setup globally, for a chosen timecode definition */
-
-int timecoder_build_lookup(char *timecode_name, struct timecoder_t *timecoder) {
-    unsigned int n, current;
-
+static inline bits_t lfsr(bits_t code, bits_t taps)
+{
+    bits_t taken;
+    int xrs;
+
+    taken = code & taps;
+    xrs = 0;
+    while (taken != 0x0) {
+        xrs += taken & 0x1;
+        taken >>= 1;
+    }
+
+    return xrs & 0x1;
+}
+
+
+static inline bits_t fwd(bits_t current, struct timecode_def_t *def)
+{
+    bits_t l;
+
+    /* New bits are added at the MSB; shift right by one */
+
+    l = lfsr(current, def->taps | 0x1);
+    return (current >> 1) | (l << (def->bits - 1));
+}
+
+
+static inline bits_t rev(bits_t current, struct timecode_def_t *def)
+{
+    bits_t l, mask;
+
+    /* New bits are added at the LSB; shift left one and mask */
+
+    mask = (1 << def->bits) - 1;
+    l = lfsr(current, (def->taps >> 1) | (0x1 << (def->bits - 1)));
+    return ((current << 1) & mask) | l;
+}
+
+
+static struct timecode_def_t* find_definition(const char *name)
+{
     struct timecode_def_t *def;
+
     def = &timecode_def[0];
-
-    while(def->name) {
-        if(!strcmp(def->name, timecode_name))
-            break;
+    while (def->name) {
+        if (!strcmp(def->name, name))
+            return def;
         def++;
     }
-
-    if(!def->name) {
-        fprintf(stderr, "Timecode definition '%s' is not known.\n",
-                timecode_name);
-        return -1;
-    }
-
-    //Copy the lookup table stuff
-    if (timecoder->tc_table == NULL) {
-        timecoder->tc_table = malloc(sizeof(struct timecode_def_t));
-    }
-    memcpy(timecoder->tc_table, def, sizeof(struct timecode_def_t));
-
-    //fprintf(stderr, "Allocating %d slots (%zuKb) for %d bit timecode (%s)\n",
-    //        2 << timecoder->tc_table->bits, (2 << timecoder->tc_table->bits) * sizeof(unsigned int) / 1024,
-    //        timecoder->tc_table->bits, timecoder->tc_table->desc);
-
-    timecoder->tc_table->lookup = malloc((2 << timecoder->tc_table->bits) * sizeof(unsigned int));
-    if(!timecoder->tc_table->lookup) {
-        perror("malloc");
+    return NULL;
+}
+
+
+/* Where necessary, build the lookup table required for this timecode */
+
+static int build_lookup(struct timecode_def_t *def)
+{
+    unsigned int n;
+    bits_t current, last;
+
+    if (def->lookup)
         return 0;
-    }
-   
-    for(n = 0; n < ((unsigned int)2 << timecoder->tc_table->bits); n++)
-        timecoder->tc_table->lookup[n] = -1;
-    
-    current = timecoder->tc_table->seed;
-    
-    for(n = 0; n < timecoder->tc_table->length; n++) {
-        if(timecoder->tc_table->lookup[current] != -1) {
-            //fprintf(stderr, "Timecode has wrapped; finishing here.\n");
-            return -1;
-        }
-        
-        timecoder->tc_table->lookup[current] = n;
-        current = (current >> 1) + (lfsr(current, timecoder) << (timecoder->tc_table->bits - 1));
-        //printf("n=%d\n", n);
-    }
+
+    fprintf(stderr, "Building LUT for %d bit %dHz timecode (%s)\n",
+            def->bits, def->resolution, def->desc);
+
+    if (lut_init(&def->lut, def->length) == -1)
+	return -1;
+
+    current = def->seed;
+    
+    for (n = 0; n < def->length; n++) {
+        /* timecode must not wrap */
+        assert(lut_lookup(&def->lut, current) == (unsigned)-1);
+        lut_push(&def->lut, current);
+        last = current;
+        current = fwd(current, def);
+        assert(rev(current, def) == last);
+    }
+
+    def->lookup = true;
     
     return 0;    
 }
 
 
-/* Free the timecoder lookup table when it is no longer needed */
-
-void timecoder_free_lookup(struct timecoder_t* timecoder) {
-    if (timecoder->tc_table->lookup)
-    {
-        free(timecoder->tc_table->lookup);
-        timecoder->tc_table->lookup = NULL;
+/* Free the timecoder lookup tables when they are no longer needed */
+
+void timecoder_free_lookup(void) {
+    struct timecode_def_t *def;
+
+    def = &timecode_def[0];
+    while (def->name) {
+        if (def->lookup)
+            lut_clear(&def->lut);
+        def++;
     }
 }
 
@@ -233,40 +249,43 @@
 {
     ch->positive = 0;
     ch->zero = 0;
-    ch->crossing_ticker = 0;
 }
 
 
-/* Initialise a timecode decoder */
+/* Initialise a timecode decoder at the given reference speed */
 
-void timecoder_init(struct timecoder_t *tc)
+int timecoder_init(struct timecoder_t *tc, const char *def_name, double speed,
+		   unsigned int sample_rate)
 {
-    int c;
+    /* A definition contains a lookup table which can be shared
+     * across multiple timecoders */
+
+    tc->def = find_definition(def_name);
+    if (tc->def == NULL) {
+        fprintf(stderr, "Timecode definition '%s' is not known.\n", def_name);
+        return -1;
+    }
+    if (build_lookup(tc->def) == -1)
+        return -1;
+    tc->speed = speed;
+
+    tc->dt = 1.0 / sample_rate;
+    tc->zero_alpha = tc->dt / (ZERO_RC + tc->dt);
 
     tc->forwards = 1;
-    tc->rate = TIMECODER_RATE;
-
-    tc->half_peak = 0;
-    tc->wave_peak = 0;
-    tc->ref_level = -1;
-    tc->signal_level = 0;
-
-    init_channel(&tc->mono);
-    for(c = 0; c < TIMECODER_CHANNELS; c++)
-        init_channel(&tc->channel[c]);
-        
-    tc->crossings = 0;
-    tc->pitch_ticker = 0;
-
+    init_channel(&tc->primary);
+    init_channel(&tc->secondary);
+    pitch_init(&tc->pitch, tc->dt);
+
+    tc->ref_level = 32768.0;
     tc->bitstream = 0;
     tc->timecode = 0;
     tc->valid_counter = 0;
     tc->timecode_ticker = 0;
 
     tc->mon = NULL;
-    tc->log_fd = -1;
-    
-    tc->tc_table = NULL;
+
+    return 0;
 }
 
 
@@ -282,13 +301,17 @@
  * display of the incoming audio. Initialise one for the given
  * timecoder */
 
-void timecoder_monitor_init(struct timecoder_t *tc, int size, int scale)
+int timecoder_monitor_init(struct timecoder_t *tc, int size)
 {
     tc->mon_size = size;
-    tc->mon_scale = scale;
-    tc->mon = malloc(SQ(tc->mon_size));
+    tc->mon = (unsigned char*)malloc(SQ(tc->mon_size));
+    if (tc->mon == NULL) {
+        perror("malloc");
+        return -1;
+    }
     memset(tc->mon, 0, SQ(tc->mon_size));
     tc->mon_counter = 0;
+    return 0;
 }
 
 
@@ -296,300 +319,212 @@
 
 void timecoder_monitor_clear(struct timecoder_t *tc)
 {
-    if(tc->mon) {
+    if (tc->mon) {
         free(tc->mon);
         tc->mon = NULL;
     }
 }
 
 
-static int detect_zero_crossing(struct timecoder_channel_t *ch,
-                                signed short v, int rate)
+static void detect_zero_crossing(struct timecoder_channel_t *ch,
+                                 signed int v, float alpha)
 {
-    int swapped;
-
     ch->crossing_ticker++;
 
-    swapped = 0;
-    if(v >= ch->zero + ZERO_THRESHOLD && !ch->positive) {
-        swapped = 1;
+    ch->swapped = 0;
+    if (v > ch->zero + ZERO_THRESHOLD && !ch->positive) {
+        ch->swapped = 1;
         ch->positive = 1;
         ch->crossing_ticker = 0;
-    } else if(v < ch->zero - ZERO_THRESHOLD && ch->positive) {
-        swapped = 1;
+    } else if (v < ch->zero - ZERO_THRESHOLD && ch->positive) {
+        ch->swapped = 1;
         ch->positive = 0;
         ch->crossing_ticker = 0;
     }
     
-    ch->zero += (v - ch->zero) * ZERO_AVG / rate;
+    ch->zero += alpha * (v - ch->zero);
+}
+
+
+/* Plot the given sample value in the monitor (scope) */
+
+static void update_monitor(struct timecoder_t *tc, signed int x, signed int y)
+{
+    int px, py, p;
+    float v, w;
+
+    if (!tc->mon)
+        return;
+
+    /* Decay the pixels already in the montior */
+        
+    if (++tc->mon_counter % MONITOR_DECAY_EVERY == 0) {
+        for (p = 0; p < SQ(tc->mon_size); p++) {
+            if (tc->mon[p])
+                tc->mon[p] = tc->mon[p] * 7 / 8;
+        }
+    }
+        
+    v = (float)x / tc->ref_level / 2;
+    w = (float)y / tc->ref_level / 2;
+        
+    px = tc->mon_size / 2 + (v * tc->mon_size / 2);
+    py = tc->mon_size / 2 + (w * tc->mon_size / 2);
+
+    /* Set the pixel value to white */
+            
+    if (px > 0 && px < tc->mon_size && py > 0 && py < tc->mon_size)
+        tc->mon[py * tc->mon_size + px] = 0xff;
+}
+
+
+/* Process a single bitstream reading */
+
+static void process_bitstream(struct timecoder_t *tc, signed int m)
+{
+    bits_t b;
+
+    b = m > tc->ref_level;
+
+    /* Add it to the bitstream, and work out what we were expecting
+     * (timecode). */
+
+    /* tc->bitstream is always in the order it is physically placed on
+     * the vinyl, regardless of the direction. */
+
+    if (tc->forwards) {
+	tc->timecode = fwd(tc->timecode, tc->def);
+	tc->bitstream = (tc->bitstream >> 1)
+	    + (b << (tc->def->bits - 1));
+
+    } else {
+	bits_t mask;
+
+	mask = ((1 << tc->def->bits) - 1);
+	tc->timecode = rev(tc->timecode, tc->def);
+	tc->bitstream = ((tc->bitstream << 1) & mask) + b;
+    }
+
+    if (tc->timecode == tc->bitstream)
+	tc->valid_counter++;
+    else {
+	tc->timecode = tc->bitstream;
+	tc->valid_counter = 0;
+    }
+
+    /* Take note of the last time we read a valid timecode */
     
-    return swapped;
+    tc->timecode_ticker = 0;
+
+    /* Adjust the reference level based on this new peak */
+
+    tc->ref_level = (tc->ref_level * (REF_PEAKS_AVG - 1) + m) / REF_PEAKS_AVG;
+
+#ifdef DEBUG_BITSTREAM
+    fprintf(stderr, "%+6d zero, %+6d (ref %+6d)\t= %d%c (%5d)\n",
+	    tc->primary.zero,
+	    m,
+	    tc->ref_level,
+	    b,
+	    tc->valid_counter == 0 ? 'x' : ' ',
+	    tc->valid_counter);
+#endif
+}
+
+
+/* Process a single sample from the incoming audio */
+
+static void process_sample(struct timecoder_t *tc,
+			   signed int primary, signed int secondary)
+{
+    signed int m; /* pcm sample, sum of two shorts */
+
+    detect_zero_crossing(&tc->primary, primary, tc->zero_alpha);
+    detect_zero_crossing(&tc->secondary, secondary, tc->zero_alpha);
+
+    m = abs(primary - tc->primary.zero);
+
+    /* If an axis has been crossed, use the direction of the crossing
+     * to work out the direction of the vinyl */
+
+    if (tc->primary.swapped) {
+	tc->forwards = (tc->primary.positive != tc->secondary.positive);
+	if (tc->def->flags & SWITCH_PHASE)
+	    tc->forwards = !tc->forwards;
+    } if (tc->secondary.swapped) {
+	tc->forwards = (tc->primary.positive == tc->secondary.positive);
+	if (tc->def->flags & SWITCH_PHASE)
+	    tc->forwards = !tc->forwards;
+    }
+
+    /* If any axis has been crossed, register movement using the pitch
+     * counters */
+
+    if (!tc->primary.swapped && !tc->secondary.swapped)
+	pitch_dt_observation(&tc->pitch, 0.0);
+    else {
+	float dx;
+
+	dx = 1.0 / tc->def->resolution / 4;
+	if (!tc->forwards)
+	    dx = -dx;
+	pitch_dt_observation(&tc->pitch, dx);
+    }
+
+    /* If we have crossed the primary channel in the right polarity,
+     * it's time to read off a timecode 0 or 1 value */
+
+    if (tc->secondary.swapped &&
+       tc->primary.positive == ((tc->def->flags & SWITCH_POLARITY) == 0))
+    {
+	process_bitstream(tc, m);
+    }
+
+    tc->timecode_ticker++;
 }
 
 
 /* Submit and decode a block of PCM audio data to the timecoder */
 
-int timecoder_submit(struct timecoder_t *tc, signed short *pcm, int samples)
+void timecoder_submit(struct timecoder_t *tc, signed short *pcm, size_t npcm)
 {
-    int b, l, /* bitstream and timecode bits */
-        s, c,
-        x, y, p, /* monitor coordinates */
-        v,
-        offset,
-        swapped,
-        monitor_centre;
-    signed short w; /* pcm sample values */
-    unsigned int mask;
-    
-    b = 0;
-    l = 0;
-    
-    mask = ((1 << tc->tc_table->bits) - 1);
-    monitor_centre = tc->mon_size / 2;
-
-    offset = 0;
-
-    for(s = 0; s < samples; s++) {
-        
-        for(c = 0; c < TIMECODER_CHANNELS; c++)
-            detect_zero_crossing(&tc->channel[c], pcm[offset + c], tc->rate);
-
-        /* Read from the mono channel */
-        
-        v = pcm[offset] + pcm[offset + 1];
-        swapped = detect_zero_crossing(&tc->mono, v, tc->rate);
-
-        /* If a sign change in the (zero corrected) audio has
-         * happened, log the peak information */
-        
-        if(swapped) {
-            
-            /* Work out whether half way through a cycle we are
-             * looking for the wave to be positive or negative */
-            
-            if(tc->mono.positive == (tc->tc_table->polarity ^ tc->forwards)) {
-                
-                /* Entering the second half of a wave cycle */
-                
-                tc->half_peak = tc->wave_peak;
-                
-            } else {
-                
-                /* Completed a full wave cycle, so time to analyse the
-                 * level and work out whether it's a 1 or 0 */
-                
-                b = tc->wave_peak + tc->half_peak > tc->ref_level;
-                
-                /* Log binary timecode */
-                
-                if(tc->log_fd != -1)
-                    write(tc->log_fd, b ? "1" : "0", 1);
-                
-                /* Add it to the bitstream, and work out what we were
-                 * expecting (timecode). */
-                
-                /* tc->bitstream is always in the order it is
-                 * physically placed on the vinyl, regardless of the
-                 * direction. */
-                
-                if(tc->forwards) {
-                    l = lfsr(tc->timecode, tc);
-                    
-                    tc->bitstream = (tc->bitstream >> 1)
-                        + (b << (tc->tc_table->bits - 1));
-                    
-                    tc->timecode = (tc->timecode >> 1)
-                        + (l << (tc->tc_table->bits - 1));
-                    
-                } else {
-                    l = lfsr_rev(tc->timecode, tc);
-                    
-                    tc->bitstream = ((tc->bitstream << 1) & mask) + b;
-                    tc->timecode = ((tc->timecode << 1) & mask) + l;
-                }
-                
-                if(b == l) {
-                    tc->valid_counter++;
-                } else {
-                    tc->timecode = tc->bitstream;
-                    tc->valid_counter = 0;
-                }
-                
-                /* Take note of the last time we read a valid timecode */
-                
-                tc->timecode_ticker = 0;
-                
-                /* Adjust the reference level based on the peaks seen
-                 * in this cycle */
-                
-                if(tc->ref_level == -1)
-                    tc->ref_level = tc->half_peak + tc->wave_peak;
-                else {
-                    tc->ref_level = (tc->ref_level * (REF_PEAKS_AVG - 1)
-                                     + tc->half_peak + tc->wave_peak)
-                        / REF_PEAKS_AVG;
-                }
-                
-            }
-            
-            /* Calculate the immediate direction from phase difference,
-             * based on the last channel to cross zero */
-
-            if(tc->channel[0].crossing_ticker > tc->channel[1].crossing_ticker)
-                tc->forwards = 1;
-            else
-                tc->forwards = 0;
-
-            if(tc->forwards)
-                tc->crossings++;
-            else
-                tc->crossings--;
-            
-            tc->pitch_ticker += tc->crossing_ticker;
-            tc->crossing_ticker = 0;
-            tc->wave_peak = 0;
-            
-        } /* swapped */
-        
-        tc->crossing_ticker++;
-        tc->timecode_ticker++;
-        
-        /* Find the zero-normalised sample of the peak value from
-         * the input */
-        
-        w = abs(v - tc->mono.zero);
-        if(w > tc->wave_peak)
-            tc->wave_peak = w;
-        
-        /* Take a rolling average of zero and signal level */
-
-        tc->signal_level += (w - tc->signal_level) * SIGNAL_AVG / tc->rate;
-
-        /* Update the monitor to add the incoming sample */
-        
-        if(tc->mon) {
-            
-            /* Decay the pixels already in the montior */
-            
-            if(++tc->mon_counter % MONITOR_DECAY_EVERY == 0) {
-                for(p = 0; p < SQ(tc->mon_size); p++) {
-                    if(tc->mon[p])
-                        tc->mon[p] = tc->mon[p] * 7 / 8;
-                }
-            }
-            
-            v = pcm[offset]; /* first channel */
-            w = pcm[offset + 1]; /* second channel */
-            
-            x = monitor_centre + (v * tc->mon_size * tc->mon_scale / 32768);
-            y = monitor_centre + (w * tc->mon_size * tc->mon_scale / 32768);
-            
-            /* Set the pixel value to white */
-            
-            if(x > 0 && x < tc->mon_size && y > 0 && y < tc->mon_size)
-                tc->mon[y * tc->mon_size + x] = 0xff;
+    while (npcm--) {
+	signed int primary, secondary;
+
+        if (tc->def->flags & SWITCH_PRIMARY) {
+            primary = pcm[0];
+            secondary = pcm[1];
+        } else {
+            primary = pcm[1];
+            secondary = pcm[0];
         }
-        
-        offset += TIMECODER_CHANNELS;
-        
-    } /* for each sample */
-    
-    /* Print debugging information */
-    
-#if 0
-    fprintf(stderr, "%+6d +/%4d -/%4d (%4d,%4d)\t= %d (%d) %c %d"
-            "\t[crossings: %d %d]",
-            tc->mono.zero,
-            tc->half_peak,
-            tc->wave_peak,
-            tc->ref_level >> 1,
-            tc->signal_level,
-            b, l, b == l ? ' ' : 'x',
-            tc->valid_counter,
-            tc->crossings,
-            tc->pitch_ticker);
-
-    if(tc->pitch_ticker)
-        fprintf(stderr, " = %d", tc->rate * tc->crossings / tc->pitch_ticker);
-
-    fputc('\n', stderr);
-#endif
-
-    return 0;
-}
-
-
-/* Return the timecode pitch, based on cycles of the sine wave. This
- * function can only be called by one context, at it resets the state
- * of the counter in the timecoder. */
-
-int timecoder_get_pitch(struct timecoder_t *tc, float *pitch)
-{
-    /* Let the caller know if there's no data to gather pitch from */
-
-    if(tc->crossings == 0)
-        return -1;
-
-    /* Value of tc->crossings may be negative in reverse */
-    
-    *pitch = tc->rate * (float)tc->crossings / tc->pitch_ticker
-        / (tc->tc_table->resolution * 2);
-
-    tc->crossings = 0;
-    tc->pitch_ticker = 0;
-
-    return 0;
+
+	process_sample(tc, primary, secondary);
+
+        update_monitor(tc, pcm[0], pcm[1]);
+        pcm += TIMECODER_CHANNELS;
+    }
 }
 
 
 /* Return the known position in the timecode, or -1 if not known. If
  * two few bits have been error-checked, then this also counts as
- * invalid. If 'when' is given, return the time, in input samples since
- * this value was read. */
+ * invalid. If 'when' is given, return the time, in seconds since this
+ * value was read. */
 
-signed int timecoder_get_position(struct timecoder_t *tc, int *when)
+signed int timecoder_get_position(struct timecoder_t *tc, float *when)
 {
     signed int r;
 
-    if(tc->valid_counter > VALID_BITS) {
-        r = tc->tc_table->lookup[tc->bitstream];
+    if (tc->valid_counter > VALID_BITS) {
+        r = lut_lookup(&tc->def->lut, tc->bitstream);
 
-        if(r >= 0) {
-            if(when) 
-                *when = tc->timecode_ticker;
+        if (r >= 0) {
+            if (when)
+                *when = tc->timecode_ticker * tc->dt;
             return r;
         }
     }
     
     return -1;
 }
-
-
-/* Return non-zero if there is any timecode signal available */
-
-int timecoder_get_alive(struct timecoder_t *tc)
-{
-    if(tc->signal_level < SIGNAL_THRESHOLD)
-        return 0;
-    
-    return 1;
-}
-
-
-/* Return the last 'safe' timecode value on the record. Beyond this
- * value, we probably want to ignore the timecode values, as we will
- * hit the label of the record. */
-
-unsigned int timecoder_get_safe(struct timecoder_t *tc)
-{
-    return tc->tc_table->safe;
-}
-
-
-/* Return the resolution of the timecode. This is the number of bits
- * per second, which corresponds to the frequency of the sine wave */
-
-int timecoder_get_resolution(struct timecoder_t *tc)
-{
-    return tc->tc_table->resolution;
-}

=== added file 'mixxx/res/images/library/ic_library_recordings.png'
Binary files mixxx/res/images/library/ic_library_recordings.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_recordings.png	2011-04-22 09:04:29 +0000 differ
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2011-01-24 15:07:37 +0000
+++ mixxx/res/mixxx.qrc	2011-04-22 09:04:29 +0000
@@ -30,5 +30,6 @@
         <file>images/library/ic_library_promotracks.png</file>
         <file>images/library/ic_library_rhythmbox.png</file>
         <file>images/library/ic_library_traktor.png</file>
+        <file>images/library/ic_library_recordings.png</file>
     </qresource>
 </RCC>

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2011-04-03 15:57:56 +0000
+++ mixxx/res/schema.xml	2011-04-22 09:04:29 +0000
@@ -280,8 +280,8 @@
       Add support for multi-level crates and playlists.
     </description>
     <sql>
-      ALTER TABLE crates ADD COLUMN parent INTEGER DEFAULT 0;
-      ALTER TABLE Playlists ADD COLUMN parent INTEGER DEFAULT 0;
+      ALTER TABLE crates ADD COLUMN parent INTEGER DEFAULT -1;
+      ALTER TABLE Playlists ADD COLUMN parent INTEGER DEFAULT -1;
     </sql>
   </revision>
 </schema>

=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/skin.xml'
--- mixxx/res/skins/Outline1024x600-Netbook/skin.xml	2011-03-22 16:24:04 +0000
+++ mixxx/res/skins/Outline1024x600-Netbook/skin.xml	2011-04-22 09:04:29 +0000
@@ -949,6 +949,83 @@
 			<ConfigKey>[Master],PeakIndicator</ConfigKey>
 		</Connection>
 	</StatusLight>
+	
+	<!--
+	**********************************************
+	Vinyl Stuff
+	**********************************************
+	-->
+	
+	<StatusLight>
+	  <Tooltip>Vinyl Status</Tooltip>
+	  <NumberPos>4</NumberPos>
+	  <PathBack>vinyl-status-disabled.png</PathBack>
+	  <PathStatusLight>vinyl-status-green.png</PathStatusLight>
+	  <PathStatusLight2>vinyl-status-yellow.png</PathStatusLight2>
+	  <PathStatusLight3>vinyl-status-red.png</PathStatusLight3>
+	  <Pos>357,194</Pos>
+	  <Connection>
+	   <ConfigKey>[Channel1],vinylcontrol_status</ConfigKey>
+	  </Connection>
+	</StatusLight>
+	<StatusLight>
+	  <Tooltip>Vinyl Status</Tooltip>
+	  <NumberPos>4</NumberPos>
+	  <PathBack>vinyl-status-disabled.png</PathBack>
+	  <PathStatusLight>vinyl-status-green.png</PathStatusLight>
+	  <PathStatusLight2>vinyl-status-yellow.png</PathStatusLight2>
+	  <PathStatusLight3>vinyl-status-red.png</PathStatusLight3>
+	  <Pos>597,194</Pos>
+	  <Connection>
+	   <ConfigKey>[Channel2],vinylcontrol_status</ConfigKey>
+	  </Connection>
+	</StatusLight>
+	<PushButton>
+	  <Tooltip>Vinyl Control Mode</Tooltip>
+	  <NumberStates>3</NumberStates>
+	  <State>
+		   <Number>0</Number>
+		   <Pressed>vinyl-abs.png</Pressed>
+		   <Unpressed>vinyl-abs.png</Unpressed>
+	  </State>
+	  <State>
+		   <Number>1</Number>
+		   <Pressed>vinyl-rel.png</Pressed>
+		   <Unpressed>vinyl-rel.png</Unpressed>
+	  </State>
+	  <State>
+		   <Number>2</Number>
+		   <Pressed>vinyl-const.png</Pressed>
+		   <Unpressed>vinyl-const.png</Unpressed>
+	  </State>
+	  <Pos>380,192</Pos>
+	  <Connection>
+	  	 	<ConfigKey>[Channel1],vinylcontrol_mode</ConfigKey>
+	  </Connection>
+ 	</PushButton>
+ 	<PushButton>
+	  <Tooltip>Vinyl Control Mode</Tooltip>
+	  <NumberStates>3</NumberStates>
+	  <State>
+		   <Number>0</Number>
+		   <Pressed>vinyl-abs.png</Pressed>
+		   <Unpressed>vinyl-abs.png</Unpressed>
+	  </State>
+	  <State>
+		   <Number>1</Number>
+		   <Pressed>vinyl-rel.png</Pressed>
+		   <Unpressed>vinyl-rel.png</Unpressed>
+	  </State>
+	  <State>
+		   <Number>2</Number>
+		   <Pressed>vinyl-const.png</Pressed>
+		   <Unpressed>vinyl-const.png</Unpressed>
+	  </State>
+	  <Pos>621,192</Pos>
+	  <Connection>
+	  	 	<ConfigKey>[Channel2],vinylcontrol_mode</ConfigKey>
+	  </Connection>
+ 	</PushButton>
 
 	<!--
 	############################################################################################

=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-abs.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-abs.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-abs.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-const.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-const.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-const.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-rel.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-rel.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-rel.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-disabled.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-disabled.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-disabled.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-green.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-green.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-green.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-red.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-red.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-red.png	2011-04-22 09:04:29 +0000 differ
=== added file 'mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-yellow.png'
Binary files mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-yellow.png	1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/vinyl-status-yellow.png	2011-04-22 09:04:29 +0000 differ
=== modified file 'mixxx/src/analyserwaveform.cpp'
--- mixxx/src/analyserwaveform.cpp	2011-03-12 20:57:10 +0000
+++ mixxx/src/analyserwaveform.cpp	2011-04-22 09:04:29 +0000
@@ -41,6 +41,7 @@
 
     // Downsample from curSamples -> numDownsamples
 
+    // TODO(XXX) leaked memory
     downsample = new QVector<float>(numDownsamples);
     downsampleVector = downsample->data();
     int i;

=== modified file 'mixxx/src/audiotagger.cpp'
--- mixxx/src/audiotagger.cpp	2010-12-12 15:47:46 +0000
+++ mixxx/src/audiotagger.cpp	2011-04-22 09:04:29 +0000
@@ -21,7 +21,7 @@
 #include <taglib/wavfile.h>
 #include <taglib/textidentificationframe.h>
 
-AudioTagger::AudioTagger (QString file) 
+AudioTagger::AudioTagger (QString file)
 {
     m_artist = "";
     m_title = "";
@@ -36,8 +36,8 @@
     m_file = file;
 }
 
-AudioTagger::~AudioTagger ( ) 
-{ 
+AudioTagger::~AudioTagger ( )
+{
 
 }
 
@@ -96,58 +96,58 @@
 {
     m_tracknumber = tracknumber;
 }
-void AudioTagger::save ()
+bool AudioTagger::save ()
 {
     TagLib::File* file = NULL;
-    
+
     if(m_file.endsWith(".mp3", Qt::CaseInsensitive)){
         file =  new TagLib::MPEG::File(m_file.toUtf8().constData());
         //process special ID3 fields, APEv2 fiels, etc
-    
+
         //If the mp3 has no ID3v2 tag, we create a new one and add the TBPM and TKEY frame
         addID3v2Tag( ((TagLib::MPEG::File*) file)->ID3v2Tag(true)  );
-        //If the mp3 has an APE tag, we update 
+        //If the mp3 has an APE tag, we update
         addAPETag( ((TagLib::MPEG::File*) file)->APETag(false)  );
-        
+
     }
     if(m_file.endsWith(".m4a", Qt::CaseInsensitive)){
         file =  new TagLib::MP4::File(m_file.toUtf8().constData());
         //process special ID3 fields, APEv2 fiels, etc
         processMP4Tag(((TagLib::MP4::File*) file)->tag());
-   
+
     }
     if(m_file.endsWith(".ogg", Qt::CaseInsensitive)){
         file =  new TagLib::Ogg::Vorbis::File(m_file.toUtf8().constData());
         //process special ID3 fields, APEv2 fiels, etc
         addXiphComment( ((TagLib::Ogg::Vorbis::File*) file)->tag()   );
-   
+
     }
     if(m_file.endsWith(".wav", Qt::CaseInsensitive)){
         file =  new TagLib::RIFF::WAV::File(m_file.toUtf8().constData());
         //If the flac has no ID3v2 tag, we create a new one and add the TBPM and TKEY frame
         addID3v2Tag( ((TagLib::RIFF::WAV::File*) file)->tag()  );
-   
+
     }
     if(m_file.endsWith(".flac", Qt::CaseInsensitive)){
         file =  new TagLib::FLAC::File(m_file.toUtf8().constData());
-       
+
         //If the flac has no ID3v2 tag, we create a new one and add the TBPM and TKEY frame
         addID3v2Tag( ((TagLib::FLAC::File*) file)->ID3v2Tag(true)  );
         //If the flac has no APE tag, we create a new one and add the TBPM and TKEY frame
         addXiphComment( ((TagLib::FLAC::File*) file)->xiphComment (true)   );
-   
+
     }
     if(m_file.endsWith(".aif", Qt::CaseInsensitive) || m_file.endsWith(".aiff", Qt::CaseInsensitive)){
         file =  new TagLib::RIFF::AIFF::File(m_file.toUtf8().constData());
         //If the flac has no ID3v2 tag, we create a new one and add the TBPM and TKEY frame
         addID3v2Tag( ((TagLib::RIFF::AIFF::File*) file)->tag()  );
-   
+
     }
-    
+
     //process standard tags
     if(file){
         TagLib::Tag *tag = file->tag();
-        if (tag) 
+        if (tag)
         {
             tag->setArtist(m_artist.toStdString());
             tag->setTitle(m_title.toStdString());
@@ -155,58 +155,65 @@
             tag->setGenre(m_genre.toStdString());
             tag->setComment(m_comment.toStdString());
             uint year =  m_year.toUInt();
-            if(year >  0)         
+            if(year >  0)
                 tag->setYear(year);
             uint tracknumber = m_tracknumber.toUInt();
             if(tracknumber > 0)
                 tag->setTrack(tracknumber);
-           
+
         }
         //write audio tags to file
-        if(file->save())
+        int success = file->save();
+        if (success) {
             qDebug() << "Successfully updated metadata of track " << m_file;
-        else
+        } else {
              qDebug() << "Could not update metadata of track " << m_file;
+         }
+        //delete file and return
         delete file;
-    }
-
-   
+        return success;
+    }
+    else{
+        return false;
+    }
+
+
 }
 void AudioTagger::addID3v2Tag(TagLib::ID3v2::Tag* id3v2)
 {
     if(!id3v2) return;
-    
+
     TagLib::ID3v2::FrameList bpmFrame = id3v2->frameListMap()["TBPM"];
-    if (!bpmFrame.isEmpty()) 
+    if (!bpmFrame.isEmpty())
     {
         bpmFrame.front()->setText(m_bpm.toStdString());
-        
+
     }
     else
     {
-        /* 
+        /*
          * add new frame TextIdentificationFrame which is responsible for TKEY and TBPM
          * see http://developer.kde.org/~wheeler/taglib/api/classTagLib_1_1ID3v2_1_1TextIdentificationFrame.html
          */
-       
+
         TagLib::ID3v2::TextIdentificationFrame* newFrame = new TagLib::ID3v2::TextIdentificationFrame("TBPM", TagLib::String::Latin1);
-        
+
         newFrame->setText(m_bpm.toStdString());
         id3v2->addFrame(newFrame);
 
     }
 
     TagLib::ID3v2::FrameList keyFrame = id3v2->frameListMap()["TKEY"];
-    if (!keyFrame.isEmpty()) 
+    if (!keyFrame.isEmpty())
     {
         keyFrame.front()->setText(m_key.toStdString());
-        
+
     }
     else
     {
         //add new frame
         TagLib::ID3v2::TextIdentificationFrame* newFrame = new TagLib::ID3v2::TextIdentificationFrame("TKEY", TagLib::String::Latin1);
-        
+
         newFrame->setText(m_key.toStdString());
         id3v2->addFrame(newFrame);
 
@@ -217,12 +224,12 @@
 {
     if(!ape) return;
     /*
-     * Adds to the item specified by key the data value. 
-     * If replace is true, then all of the other values on the same key will be removed first. 
+     * Adds to the item specified by key the data value.
+     * If replace is true, then all of the other values on the same key will be removed first.
      */
     ape->addValue("BPM",m_bpm.toStdString(), true);
     ape->addValue("BPM",m_bpm.toStdString(), true);
-		
+
 
 }
 void AudioTagger::addXiphComment(TagLib::Ogg::XiphComment* xiph)
@@ -230,21 +237,21 @@
     if(!xiph) return;
 
     // Some tools use "BPM" so check for that.
-    
+
     /* Taglib does not support the update of Vorbis comments.
      * thus, we have to reomve the old comment and add the new one
      */
-    xiph->removeField("BPM");  	
+    xiph->removeField("BPM");
     xiph->addField("BPM", m_bpm.toStdString());
 
-    xiph->removeField("TEMPO");  	
-    xiph->addField("TEMPO", m_bpm.toStdString()); 
-  
-    xiph->removeField("INITIALKEY");  	
-    xiph->addField("INITIALKEY", m_key.toStdString()); 
-    xiph->removeField("KEY");  	
-    xiph->addField("KEY", m_key.toStdString());   
-       
+    xiph->removeField("TEMPO");
+    xiph->addField("TEMPO", m_bpm.toStdString());
+
+    xiph->removeField("INITIALKEY");
+    xiph->addField("INITIALKEY", m_key.toStdString());
+    xiph->removeField("KEY");
+    xiph->addField("KEY", m_key.toStdString());
+
 }
 void AudioTagger::processMP4Tag(TagLib::MP4::Tag* mp4)
 {

=== modified file 'mixxx/src/audiotagger.h'
--- mixxx/src/audiotagger.h	2010-10-31 15:34:20 +0000
+++ mixxx/src/audiotagger.h	2011-04-22 09:04:29 +0000
@@ -14,7 +14,7 @@
 {
 public:
 
-  
+
     AudioTagger (QString file);
     virtual ~AudioTagger ( );
     void setArtist (QString artist );
@@ -26,8 +26,8 @@
     void setKey (QString key );
     void setBpm (QString bpm );
     void setTracknumber (QString tracknumber );
-    void save ();
-    
+    bool save();
+
 
 private:
     QString m_artist;

=== modified file 'mixxx/src/basetrackplayer.cpp'
--- mixxx/src/basetrackplayer.cpp	2011-03-29 08:45:42 +0000
+++ mixxx/src/basetrackplayer.cpp	2011-04-22 09:04:29 +0000
@@ -8,6 +8,7 @@
 #include "controlobject.h"
 #include "trackinfoobject.h"
 #include "engine/enginebuffer.h"
+#include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "soundsourceproxy.h"
 #include "engine/cuecontrol.h"
@@ -29,8 +30,8 @@
     // pSafeGroupName is leaked. It's like 5 bytes so whatever.
     const char* pSafeGroupName = strdup(getGroup().toAscii().constData());
 
-    EngineChannel* pChannel = new EngineChannel(pSafeGroupName,
-                                                pConfig, defaultOrientation);
+    EngineDeck* pChannel = new EngineDeck(pSafeGroupName,
+                                          pConfig, defaultOrientation);
     EngineBuffer* pEngineBuffer = pChannel->getEngineBuffer();
     pMixingEngine->addChannel(pChannel);
 
@@ -68,7 +69,7 @@
     m_pPlayPosition = new ControlObjectThreadMain(
         ControlObject::getControl(ConfigKey(getGroup(), "playposition")));
 
-    //Duration of the current song, we create this one because nothing else does.
+    // Duration of the current song, we create this one because nothing else does.
     m_pDuration = new ControlObject(ConfigKey(getGroup(), "duration"));
 
     //BPM of the current song
@@ -102,6 +103,7 @@
     delete m_pBPM;
     delete m_pReplayGain;
     delete m_pWaveformRenderer;
+    delete m_pDuration;
 }
 
 void BaseTrackPlayer::slotLoadTrack(TrackPointer track, bool bStartFromEndPos)

=== modified file 'mixxx/src/cachingreader.cpp'
--- mixxx/src/cachingreader.cpp	2010-10-23 08:41:23 +0000
+++ mixxx/src/cachingreader.cpp	2011-04-22 09:04:29 +0000
@@ -296,8 +296,9 @@
 }
 
 int CachingReader::read(int sample, int num_samples, CSAMPLE* buffer) {
+    int zerosWritten = 0;
     // Check for bogus sample numbers
-    Q_ASSERT(sample >= 0);
+    //Q_ASSERT(sample >= 0);
     Q_ASSERT(sample % 2 == 0);
     Q_ASSERT(num_samples >= 0);
 
@@ -309,6 +310,27 @@
         return 0;
     }
 
+    // TODO: is it possible to move this code out of caching reader
+    // and into enginebuffer?  It doesn't quite make sense here, although
+    // it makes preroll completely transparent to the rest of the code
+
+    //if we're in preroll...
+    if (sample < 0) {
+        if (sample + num_samples <= 0) {
+            //everything is zeros, easy
+            memset(buffer, 0, sizeof(*buffer) * num_samples);
+            return num_samples;
+        } else {
+            //some of the buffer is zeros, some is from the file
+            memset(buffer, 0, sizeof(*buffer) * (0 - sample));
+            buffer += (0 - sample);
+            num_samples = sample + num_samples;
+            zerosWritten = (0 - sample);
+            sample = 0;
+            //continue processing the rest of the chunks normally
+        }
+    }
+
     int start_chunk = chunkForSample(sample);
     int end_chunk = chunkForSample(sample + num_samples - 1);
 
@@ -400,7 +422,7 @@
     samples_remaining = 0;
 
     Q_ASSERT(samples_remaining == 0);
-    return num_samples - samples_remaining;
+    return zerosWritten + num_samples - samples_remaining;
 }
 
 void CachingReader::hint(Hint& hint) {
@@ -448,7 +470,7 @@
                 hint.sample = 0;
             }
         }
-        Q_ASSERT(hint.sample >= 0);
+        //Q_ASSERT(hint.sample >= 0);
         Q_ASSERT(hint.length >= 0);
         int start_chunk = chunkForSample(hint.sample);
         int end_chunk = chunkForSample(hint.sample + hint.length);

=== added file 'mixxx/src/circularbuffer.h'
--- mixxx/src/circularbuffer.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/circularbuffer.h	2011-04-22 09:04:29 +0000
@@ -0,0 +1,97 @@
+#ifndef CIRCULARBUFFER_H
+#define CIRCULARBUFFER_H
+
+#include <stdlib.h>
+
+// CircularBuffer is a basic implementation of a constant-length circular
+// buffer.
+//
+// WARNING: CircularBuffer IS NOT THREAD SAFE! It is "sort of" thread safe on
+// platforms with atomic writes and aligned memory locations, but it is most
+// definitely not safe on x86 without memory barriers that could re-order reads
+// and writes.
+template <typename T>
+class CircularBuffer {
+  public:
+    CircularBuffer(unsigned int iLength)
+            : m_iLength(iLength),
+              m_pBuffer(new T[m_iLength]),
+              m_iWritePos(0),
+              m_iReadPos(0) {
+        // No need to clear the buffer because we consider it to be empty right
+        // now.
+    }
+
+    virtual ~CircularBuffer() {
+        delete [] m_pBuffer;
+        m_pBuffer = NULL;
+    }
+
+    // Returns true if the buffer is full
+    inline bool isFull() const {
+        return (m_iWritePos + 1) % m_iLength == m_iReadPos;
+    }
+
+    // Returns true if the buffer is empty.
+    inline bool isEmpty() const {
+        return m_iReadPos == m_iWritePos;
+    }
+
+    inline void clear() {
+        m_iReadPos = 0;
+        m_iWritePos = 0;
+    }
+
+    // Returns the total capacity of the CircularBuffer in units of T
+    inline unsigned int length() const {
+        return m_iLength;
+    }
+
+    // Write numItems into the CircularBuffer. Returns the total number of
+    // items written, which could be less than numItems if the buffer becomes
+    // full.
+    unsigned int write(const T* pBuffer, const unsigned int numItems) {
+        if (m_pBuffer == NULL)
+            return 0;
+
+        unsigned int itemsWritten = 0;
+        while (!isFull() && itemsWritten < numItems) {
+            m_pBuffer[m_iWritePos++] = pBuffer[itemsWritten++];
+            m_iWritePos %= m_iLength;
+        }
+        return itemsWritten;
+    }
+
+    // Read itemsToRead into pBuffer. Returns the total number of items read,
+    // which may be less than itemsToRead if the buffer becomes empty.
+    unsigned int read(T* pBuffer, const unsigned int itemsToRead) {
+        if (m_pBuffer == NULL)
+            return 0;
+
+        unsigned int itemsRead = 0;
+        while (!isEmpty() && itemsRead < itemsToRead) {
+            pBuffer[itemsRead++] = m_pBuffer[m_iReadPos++];
+            m_iReadPos %= m_iLength;
+        }
+        return itemsRead;
+    }
+
+    unsigned int skip(const unsigned int itemsToRead) {
+        if (m_pBuffer == NULL)
+            return 0;
+        unsigned int itemsRead = 0;
+        while (!isEmpty() && itemsRead < itemsToRead) {
+            m_iReadPos = (m_iReadPos + 1) % m_iLength;
+            itemsRead++;
+        }
+        return itemsRead;
+    }
+
+  private:
+    const unsigned int m_iLength;
+    T* m_pBuffer;
+    unsigned int m_iWritePos;
+    unsigned int m_iReadPos;
+};
+
+#endif /* CIRCULARBUFFER_H */

=== modified file 'mixxx/src/configobject.cpp'
--- mixxx/src/configobject.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/configobject.cpp	2011-04-22 09:04:29 +0000
@@ -117,6 +117,10 @@
 
 template <class ValueType> ConfigObject<ValueType>::~ConfigObject()
 {
+    while (list.size() > 0) {
+        ConfigOption<ValueType>* pConfigOption = list.takeLast();
+        delete pConfigOption;
+    }
 }
 
 template <class ValueType>

=== modified file 'mixxx/src/configobject.h'
--- mixxx/src/configobject.h	2010-06-22 18:39:04 +0000
+++ mixxx/src/configobject.h	2011-04-22 09:04:29 +0000
@@ -93,21 +93,24 @@
 template <class ValueType> class ConfigOption
 {
   public:
-    ConfigOption() {};
+    ConfigOption() { val = NULL; key = NULL;};
     ConfigOption(ConfigKey *_key, ValueType *_val) { key = _key ; val = _val; };
+    virtual ~ConfigOption() {
+        delete key;
+        delete val;
+    }
     ValueType *val;
     ConfigKey *key;
 };
 
-template <class ValueType> class ConfigObject
-{
+template <class ValueType> class ConfigObject {
   public:
     ConfigKey key;
     ValueType value;
     ConfigOption<ValueType> option;
 
     ConfigObject(QString file);
-	ConfigObject(QDomNode node);
+    ConfigObject(QDomNode node);
     ~ConfigObject();
     ConfigOption<ValueType> *set(ConfigKey, ValueType);
     ConfigOption<ValueType> *get(ConfigKey key);

=== modified file 'mixxx/src/controllogpotmeter.cpp'
--- mixxx/src/controllogpotmeter.cpp	2009-08-29 20:15:00 +0000
+++ mixxx/src/controllogpotmeter.cpp	2011-04-22 09:04:29 +0000
@@ -18,6 +18,11 @@
 #include <math.h>
 #include "controllogpotmeter.h"
 
+#define maxPosition 127
+#define minPosition 0
+#define middlePosition ((maxPosition-minPosition)/2)
+#define positionrange (maxPosition-minPosition)
+
 /* -------- ------------------------------------------------------
    Purpose: Creates a new logarithmic potmeter, where the value is
             given by:

=== modified file 'mixxx/src/controlobject.cpp'
--- mixxx/src/controlobject.cpp	2010-10-23 08:41:23 +0000
+++ mixxx/src/controlobject.cpp	2011-04-22 09:04:29 +0000
@@ -156,6 +156,15 @@
     return bUpdateSuccess;
 }
 
+void ControlObject::getControls(QList<ControlObject*>* pControlList) {
+    m_sqCOHashMutex.lock();
+    for (QHash<ConfigKey, ControlObject*>::const_iterator it = m_sqCOHash.constBegin();
+         it != m_sqCOHash.constEnd(); ++it) {
+        pControlList->push_back(it.value());
+    }
+    m_sqCOHashMutex.unlock();
+}
+
 ControlObject * ControlObject::getControl(ConfigKey key)
 {
     //qDebug() << "ControlObject::getControl for (" << key.group << "," << key.item << ")";
@@ -284,8 +293,11 @@
         {
             obj = m_sqQueueThread.dequeue();
 
-            obj->pControlObject->setValueFromThread(obj->value);
-            obj->pControlObject->updateProxies(obj->pControlObjectThread);
+            if (obj->pControlObject)
+            {
+                obj->pControlObject->setValueFromThread(obj->value);
+                obj->pControlObject->updateProxies(obj->pControlObjectThread);
+            }
             delete obj;
         }
 

=== modified file 'mixxx/src/controlobject.h'
--- mixxx/src/controlobject.h	2010-10-07 03:05:48 +0000
+++ mixxx/src/controlobject.h	2011-04-22 09:04:29 +0000
@@ -68,6 +68,10 @@
     static bool disconnectControl(ConfigKey key);
     /** Returns a pointer to the ControlObject matching the given ConfigKey */
     static ControlObject *getControl(ConfigKey key);
+
+    // Adds all ControlObjects that currently exist to pControlList
+    static void getControls(QList<ControlObject*>* pControlsList);
+
     /** Used to add a pointer to the corresponding ControlObjectThread of this ControlObject */
     void addProxy(ControlObjectThread *pControlObjectThread);
     // To get rid of a proxy when the corresponding object is being deleted for example

=== modified file 'mixxx/src/controlobjectthread.cpp'
--- mixxx/src/controlobjectthread.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/controlobjectthread.cpp	2011-04-22 09:04:29 +0000
@@ -24,10 +24,10 @@
 QMutex ControlObjectThread::m_sqMutex;
 QQueue<ControlObjectThread*> ControlObjectThread::m_sqQueue;
 
-ControlObjectThread::ControlObjectThread(ControlObject * pControlObject)
-: m_dValue          (0.0)
-, m_pControlObject  (pControlObject)
-{
+ControlObjectThread::ControlObjectThread(ControlObject* pControlObject, QObject* pParent)
+        : QObject(pParent),
+          m_dValue(0.0)
+        , m_pControlObject(pControlObject) {
     // Update associated ControlObject
     if (m_pControlObject == NULL) return;
     Q_ASSERT(m_pControlObject);

=== modified file 'mixxx/src/controlobjectthread.h'
--- mixxx/src/controlobjectthread.h	2010-06-22 18:39:04 +0000
+++ mixxx/src/controlobjectthread.h	2011-04-22 09:04:29 +0000
@@ -40,7 +40,7 @@
 {
     Q_OBJECT
 public:
-    ControlObjectThread(ControlObject *pControlObject);
+    ControlObjectThread(ControlObject *pControlObject, QObject* pParent=NULL);
     virtual ~ControlObjectThread();
     /** Returns the value of the object */
     double get();

=== modified file 'mixxx/src/controlobjectthreadmain.cpp'
--- mixxx/src/controlobjectthreadmain.cpp	2009-02-26 00:19:05 +0000
+++ mixxx/src/controlobjectthreadmain.cpp	2011-04-22 09:04:29 +0000
@@ -10,7 +10,7 @@
 //
 //
 
-#include <qapplication.h>
+#include <QApplication>
 #include <QtDebug>
 //Added by qt3to4:
 #include <QEvent>
@@ -18,14 +18,13 @@
 #include "controlobject.h"
 #include "controlevent.h"
 
-ControlObjectThreadMain::ControlObjectThreadMain(ControlObject * pControlObject) : ControlObjectThread(pControlObject)
-{
+ControlObjectThreadMain::ControlObjectThreadMain(ControlObject * pControlObject, QObject* pParent)
+        : ControlObjectThread(pControlObject, pParent) {
     setObjectName("ControlObjectThreadMain");
     installEventFilter(this);
 }
 
-ControlObjectThreadMain::~ControlObjectThreadMain()
-{
+ControlObjectThreadMain::~ControlObjectThreadMain() {
 }
 
 bool ControlObjectThreadMain::eventFilter(QObject * o, QEvent * e)

=== modified file 'mixxx/src/controlobjectthreadmain.h'
--- mixxx/src/controlobjectthreadmain.h	2007-07-16 01:21:42 +0000
+++ mixxx/src/controlobjectthreadmain.h	2011-04-22 09:04:29 +0000
@@ -1,7 +1,7 @@
 //
 // C++ Interface: controlobjecthreadmain.h
 //
-// Description: 
+// Description:
 //
 //
 // Author: Tue Haste Andersen <[e-mail]>, (C) 2004
@@ -26,8 +26,8 @@
 {
     Q_OBJECT
 public:
-    ControlObjectThreadMain(ControlObject *pControlObject);
-    ~ControlObjectThreadMain();
+    ControlObjectThreadMain(ControlObject *pControlObject, QObject* pParent=NULL);
+    virtual ~ControlObjectThreadMain();
     /** Event filter */
     bool eventFilter(QObject *o, QEvent *e);
     /** Notify this object through events */

=== modified file 'mixxx/src/controlobjectthreadwidget.cpp'
--- mixxx/src/controlobjectthreadwidget.cpp	2011-03-30 05:02:25 +0000
+++ mixxx/src/controlobjectthreadwidget.cpp	2011-04-22 09:04:29 +0000
@@ -15,15 +15,14 @@
 #include "controlobject.h"
 #include "controlevent.h"
 
-ControlObjectThreadWidget::ControlObjectThreadWidget(ControlObject * pControlObject) : ControlObjectThreadMain(pControlObject)
-{
+ControlObjectThreadWidget::ControlObjectThreadWidget(ControlObject * pControlObject, QObject* pParent)
+        : ControlObjectThreadMain(pControlObject, pParent) {
     // Initialize value
     m_dValue = m_pControlObject->getValueToWidget(m_pControlObject->get());
     emitValueChanged();
 }
 
-ControlObjectThreadWidget::~ControlObjectThreadWidget()
-{
+ControlObjectThreadWidget::~ControlObjectThreadWidget() {
 }
 
 void ControlObjectThreadWidget::setWidget(QWidget * widget, bool connectValueFromWidget,

=== modified file 'mixxx/src/controlobjectthreadwidget.h'
--- mixxx/src/controlobjectthreadwidget.h	2011-03-30 05:02:25 +0000
+++ mixxx/src/controlobjectthreadwidget.h	2011-04-22 09:04:29 +0000
@@ -34,8 +34,8 @@
         EMIT_ON_PRESS_AND_RELEASE = 0x03
     };
 
-    ControlObjectThreadWidget(ControlObject *pControlObject);
-    ~ControlObjectThreadWidget();
+    ControlObjectThreadWidget(ControlObject *pControlObject, QObject* pParent=NULL);
+    virtual ~ControlObjectThreadWidget();
     /** Associates a QWidget with the ControlObject. */
     void setWidget(QWidget *widget,
                    bool connectValueFromWidget=true, bool connectValueToWidget = true,

=== modified file 'mixxx/src/controlpotmeter.cpp'
--- mixxx/src/controlpotmeter.cpp	2011-03-27 02:17:14 +0000
+++ mixxx/src/controlpotmeter.cpp	2011-04-22 09:04:29 +0000
@@ -34,18 +34,22 @@
     setSmallStep(m_dValueRange/100.f);
 
     ControlPushButton * p;
-    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up"));
-    connect(p, SIGNAL(valueChanged(double)), this, SLOT(incValue(double)));
-    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down"));
-    connect(p, SIGNAL(valueChanged(double)), this, SLOT(decValue(double)));
-    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up_small"));
-    connect(p, SIGNAL(valueChanged(double)), this, SLOT(incSmallValue(double)));
-    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down_small"));
-    connect(p, SIGNAL(valueChanged(double)), this, SLOT(decSmallValue(double)));
+    m_pControlUp = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up"));
+    connect(m_pControlUp, SIGNAL(valueChanged(double)), this, SLOT(incValue(double)));
+    m_pControlDown = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down"));
+    connect(m_pControlDown, SIGNAL(valueChanged(double)), this, SLOT(decValue(double)));
+    m_pControlUpSmall = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up_small"));
+    connect(m_pControlUpSmall, SIGNAL(valueChanged(double)), this, SLOT(incSmallValue(double)));
+    m_pControlDownSmall = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down_small"));
+    connect(m_pControlDownSmall, SIGNAL(valueChanged(double)), this, SLOT(decSmallValue(double)));
 }
 
 ControlPotmeter::~ControlPotmeter()
 {
+    delete m_pControlUp;
+    delete m_pControlDown;
+    delete m_pControlUpSmall;
+    delete m_pControlDownSmall;
 }
 
 double ControlPotmeter::getMin()

=== modified file 'mixxx/src/controlpotmeter.h'
--- mixxx/src/controlpotmeter.h	2011-03-25 19:33:44 +0000
+++ mixxx/src/controlpotmeter.h	2011-04-22 09:04:29 +0000
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 20 2002
     copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                : 
+    email                :
  ***************************************************************************/
 
 /***************************************************************************
@@ -26,6 +26,8 @@
   *@author Tue and Ken Haste Andersen
   */
 
+class ControlPushButton;
+
 class ControlPotmeter : public ControlObject
 {
   Q_OBJECT
@@ -46,7 +48,7 @@
     double getValueFromWidget(double dValue);
     double getValueToWidget(double dValue);
     double GetMidiValue();
-    
+
 public slots:
     void setValueFromThread(double dValue);
     void setValueFromEngine(double dValue);
@@ -61,14 +63,13 @@
 
 protected:
     void setValueFromMidi(MidiCategory c, double v);
-    
+
     double m_dMaxValue, m_dMinValue, m_dValueRange, m_dStep, m_dSmallStep;
 
-#define maxPosition 127
-#define minPosition 0
-#define middlePosition ((maxPosition-minPosition)/2)
-#define positionrange (maxPosition-minPosition)
-
+    ControlPushButton* m_pControlUp;
+    ControlPushButton* m_pControlDown;
+    ControlPushButton* m_pControlUpSmall;
+    ControlPushButton* m_pControlDownSmall;
 };
 
 #endif

=== modified file 'mixxx/src/controlpushbutton.cpp'
--- mixxx/src/controlpushbutton.cpp	2010-09-17 02:20:29 +0000
+++ mixxx/src/controlpushbutton.cpp	2011-04-22 09:04:29 +0000
@@ -24,6 +24,7 @@
 ControlPushButton::ControlPushButton(ConfigKey key) :
     ControlObject(key, false) {
     m_bIsToggleButton = false;
+    m_iNoStates = 2;
 }
 
 ControlPushButton::~ControlPushButton()
@@ -37,6 +38,11 @@
     m_bIsToggleButton = bIsToggleButton;
 }
 
+void ControlPushButton::setStates(int num_states)
+{
+    m_iNoStates = num_states;
+}
+
 void ControlPushButton::setValueFromMidi(MidiCategory c, double v)
 {
     //if (m_bMidiSimulateLatching)
@@ -44,55 +50,30 @@
     //qDebug() << "bMidiSimulateLatching is true!";
     // Only react on NOTE_ON midi events if simulating latching...
 
+    //qDebug() << c << v;
 
-    if (m_bIsToggleButton) //This block makes push-buttons act as toggle buttons.
-    {
-        //qDebug() << "Is a toggle button!";
-        if (c==NOTE_ON && v>0.) //Only react to "NOTE_ON" midi events.
-        {
-            //qDebug() << "NOTE_ON caught!";
-            if (m_dValue==0.)
-                m_dValue = 1.;
-            else
-                m_dValue = 0.;
+    if (m_bIsToggleButton) { //This block makes push-buttons act as toggle buttons.
+        if (m_iNoStates > 2) { //multistate button
+            if (v > 0.) { //looking for NOTE_ON doesn't seem to work...
+                m_dValue++;
+                if (m_dValue >= m_iNoStates)
+                    m_dValue = 0;
+            }
+        } else {
+            if (c == NOTE_ON) {
+                if (v > 0.) {
+                    m_dValue = !m_dValue;
+                }
+            }
         }
-    }
-    else //Not a toggle button (trigger only when button pushed)
-    {
-        //qDebug() << "Is NOT a toggle button!";
-        if (c == NOTE_ON)
+    } else { //Not a toggle button (trigger only when button pushed)
+        if (c == NOTE_ON) {
             m_dValue = v;
-        else if (c == NOTE_OFF)
+        } else if (c == NOTE_OFF) {
             m_dValue = 0.0;
-    }
-    if (c==NOTE_OFF)
-    {
-
-        //qDebug() << "NOTE_OFF caught!";
-    }
-
-
-/*    else
-    {
-        qDebug() << "bMidiSimulateLatching is false!";
-        qDebug() << "m_dValue is: " << m_dValue << ", v is: " << v;
-
-        if (v==0.)
-            m_dValue = 0.;
-        else
-            m_dValue = 1.;
-
-    }
- */
-/*
-        if (v>0.)
-        {
-            if (m_dValue==0.)
-                m_dValue = 1.;
-            else
-                m_dValue = 0.;
         }
- */
+    }
+
     emit(valueChanged(m_dValue));
 }
 

=== modified file 'mixxx/src/controlpushbutton.h'
--- mixxx/src/controlpushbutton.h	2010-10-07 03:05:48 +0000
+++ mixxx/src/controlpushbutton.h	2011-04-22 09:04:29 +0000
@@ -32,12 +32,14 @@
     ControlPushButton(ConfigKey key);
     ~ControlPushButton();
     void setToggleButton(bool bIsToggleButton);
+    void setStates(int num_states);
 
 protected:
     void setValueFromMidi(MidiCategory c, double v);
 
 private:
     bool m_bIsToggleButton;
+    int m_iNoStates;
 };
 
 #endif

=== modified file 'mixxx/src/controlvaluedelegate.cpp'
--- mixxx/src/controlvaluedelegate.cpp	2010-11-19 11:03:20 +0000
+++ mixxx/src/controlvaluedelegate.cpp	2011-04-22 09:04:29 +0000
@@ -55,6 +55,9 @@
         m_channelControlValues.append("volume");
         m_channelControlValues.append("wheel");
         m_channelControlValues.append("jog");
+        m_channelControlValues.append("vinylcontrol_enabled");
+        m_channelControlValues.append("vinylcontrol_mode");
+        m_channelControlValues.append("vinylcontrol_cueing");
         m_channelControlValues.append("loop_in");
         m_channelControlValues.append("loop_out");
         m_channelControlValues.append("reloop_exit");

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2011-03-22 16:24:04 +0000
+++ mixxx/src/dlgautodj.cpp	2011-04-22 09:04:29 +0000
@@ -9,7 +9,8 @@
 #include "dlgautodj.h"
 
 
-DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection)
+DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
+                     TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard)
      : QWidget(parent), Ui::DlgAutoDJ(), m_playlistDao(pTrackCollection->getPlaylistDAO())
 {
     setupUi(this);
@@ -20,7 +21,7 @@
     m_bPlayer1Primed = false;
     m_bPlayer2Primed = false;
     m_pTrackTableView = new WTrackTableView(this, pConfig, m_pTrackCollection);
-
+    m_pTrackTableView->installEventFilter(pKeyboard);
 
     connect(m_pTrackTableView, SIGNAL(loadTrack(TrackPointer)),
             this, SIGNAL(loadTrack(TrackPointer)));
@@ -49,6 +50,9 @@
     m_pTrackTableView->sortByColumn(0, Qt::AscendingOrder);
     m_pTrackTableView->setSortingEnabled(false);
 
+    connect(pushButtonShuffle, SIGNAL(clicked(bool)),
+            this, SLOT(shufflePlaylist(bool)));
+
     connect(pushButtonAutoDJ, SIGNAL(toggled(bool)),
             this,  SLOT(toggleAutoDJ(bool))); _blah;
 
@@ -70,6 +74,12 @@
 
 DlgAutoDJ::~DlgAutoDJ()
 {
+    delete m_pCOPlayPos1;
+    delete m_pCOPlayPos2;
+    delete m_pCOPlay1;
+    delete m_pCOPlay2;
+    delete m_pCORepeat2;
+    delete m_pCOCrossfader;
 }
 
 void DlgAutoDJ::onShow()
@@ -142,6 +152,15 @@
     m_pTrackTableView->moveSelection(delta);
 }
 
+void DlgAutoDJ::shufflePlaylist(bool buttonChecked)
+{
+    Q_UNUSED(buttonChecked);
+    m_pTrackTableView->sortByColumn(0, Qt::AscendingOrder);
+    qDebug() << "Shuffling AutoDJ playlist";
+    m_pAutoDJTableModel->shuffleTracks(m_pAutoDJTableModel->index(0, 0));
+    qDebug() << "Shuffling done";
+}
+
 void DlgAutoDJ::toggleAutoDJ(bool toggle)
 {
     if (toggle) //Enable Auto DJ

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2011-03-22 16:24:04 +0000
+++ mixxx/src/dlgautodj.h	2011-04-22 09:04:29 +0000
@@ -8,6 +8,7 @@
 #include "library/dao/playlistdao.h"
 #include "library/libraryview.h"
 #include "library/trackcollection.h"
+#include "mixxxkeyboard.h"
 
 class PlaylistTableModel;
 class WTrackTableView;
@@ -18,7 +19,8 @@
 class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public virtual LibraryView {
     Q_OBJECT
   public:
-    DlgAutoDJ(QWidget *parent, ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection);
+    DlgAutoDJ(QWidget *parent, ConfigObject<ConfigValue>* pConfig,
+              TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard);
     virtual ~DlgAutoDJ();
 
     virtual void setup(QDomNode node);
@@ -31,6 +33,7 @@
     virtual void moveSelection(int delta);
 
   public slots:
+    void shufflePlaylist(bool buttonChecked);
     void toggleAutoDJ(bool toggle);
     void player1PositionChanged(double value);
     void player2PositionChanged(double value);

=== modified file 'mixxx/src/dlgautodj.ui'
--- mixxx/src/dlgautodj.ui	2010-06-17 20:27:12 +0000
+++ mixxx/src/dlgautodj.ui	2011-04-22 09:04:29 +0000
@@ -26,6 +26,16 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
+      <widget class="QPushButton" name="pushButtonShuffle">
+       <property name="text">
+        <string>Shuffle playlist</string>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>

=== modified file 'mixxx/src/dlgprefcontrols.cpp'
--- mixxx/src/dlgprefcontrols.cpp	2011-02-20 08:50:32 +0000
+++ mixxx/src/dlgprefcontrols.cpp	2011-04-22 09:04:29 +0000
@@ -144,6 +144,14 @@
     dir.setFilter(QDir::Dirs);
 
     //
+    // Override Playing Track on Track Load
+    //
+    ComboBoxAllowTrackLoadToPlayingDeck->addItem(tr("Don't load tracks into a playing deck"));
+    ComboBoxAllowTrackLoadToPlayingDeck->addItem(tr("Load tracks into playing decks"));
+    ComboBoxAllowTrackLoadToPlayingDeck->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Controls]", "AllowTrackLoadToPlayingDeck")).toInt());
+    connect(ComboBoxAllowTrackLoadToPlayingDeck, SIGNAL(activated(int)), this, SLOT(slotSetAllowTrackLoadToPlayingDeck(int)));
+
+    //
     // Default Cue Behavior
     //
 
@@ -355,6 +363,11 @@
     m_mixxx->rebootMixxxView();
 }
 
+void DlgPrefControls::slotSetAllowTrackLoadToPlayingDeck(int)
+{
+    m_pConfig->set(ConfigKey("[Controls]","AllowTrackLoadToPlayingDeck"), ConfigValue(ComboBoxAllowTrackLoadToPlayingDeck->currentIndex()));
+}
+
 void DlgPrefControls::slotSetCueDefault(int)
 {
     m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(ComboBoxCueDefault->currentIndex()));

=== modified file 'mixxx/src/dlgprefcontrols.h'
--- mixxx/src/dlgprefcontrols.h	2011-02-20 08:50:32 +0000
+++ mixxx/src/dlgprefcontrols.h	2011-04-22 09:04:29 +0000
@@ -52,6 +52,7 @@
     void slotUpdateSchemes();
     void slotSetPositionDisplay(int);
     void slotSetPositionDisplay(double);
+    void slotSetAllowTrackLoadToPlayingDeck(int);
     void slotSetCueDefault(int);
     void slotSetCueRecall(int);
     void slotSetRateRamp(bool);

=== modified file 'mixxx/src/dlgprefcontrolsdlg.ui'
--- mixxx/src/dlgprefcontrolsdlg.ui	2010-12-20 13:13:52 +0000
+++ mixxx/src/dlgprefcontrolsdlg.ui	2011-04-22 09:04:29 +0000
@@ -229,6 +229,16 @@
        </property>
       </widget>
      </item>
+     <item row="11" column="0">
+         <widget class="QLabel" name="textLabelAllowTrackLoadToPlayingDeck">
+             <property name="text">
+                 <string>Track load behaviour</string>
+             </property>
+         </widget>
+     </item>
+     <item row="11" column="1" colspan="2">
+         <widget class="QComboBox" name="ComboBoxAllowTrackLoadToPlayingDeck"/>
+     </item>
      <item row="10" column="0">
       <widget class="QLabel" name="label">
        <property name="text">

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2010-10-29 13:22:37 +0000
+++ mixxx/src/dlgpreferences.cpp	2011-04-22 09:04:29 +0000
@@ -18,6 +18,8 @@
 
 #ifdef __VINYLCONTROL__
 #include "dlgprefvinyl.h"
+#else
+#include "dlgprefnovinyl.h"
 #endif
 
 #ifdef __SHOUTCAST__
@@ -47,7 +49,7 @@
 #include <QEvent>
 
 DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
-                               SoundManager * soundman,
+                               SoundManager * soundman, PlayerManager* pPlayerManager,
                                MidiDeviceManager * midi, ConfigObject<ConfigValue> * _config)
         :  QDialog(), Ui::DlgPreferencesDlg() {
     m_pMixxx = mixxx;
@@ -65,7 +67,7 @@
     //contentsTreeWidget->setCurrentRow(0);
 
     // Construct widgets for use in tabs
-    wsound = new DlgPrefSound(this, soundman, config);
+    wsound = new DlgPrefSound(this, soundman, pPlayerManager, config);
     wplaylist = new DlgPrefPlaylist(this, config);
     wcontrols = new DlgPrefControls(this, mixxx, pSkinLoader, config);
     weq = new DlgPrefEQ(this, config);
@@ -75,6 +77,8 @@
     wrecord = new DlgPrefRecord(this, config);
 #ifdef __VINYLCONTROL__
     wvinylcontrol = new DlgPrefVinyl(this, soundman, config);
+#else
+    wnovinylcontrol = new DlgPrefNoVinyl(this, soundman, config);
 #endif
 #ifdef __SHOUTCAST__
     wshoutcast = new DlgPrefShoutcast(this, config);
@@ -96,6 +100,8 @@
     pagesWidget->addWidget(wreplaygain);
 #ifdef __VINYLCONTROL__
     pagesWidget->addWidget(wvinylcontrol);
+#else
+    pagesWidget->addWidget(wnovinylcontrol);
 #endif
 #ifdef __SHOUTCAST__
     pagesWidget->addWidget(wshoutcast);
@@ -134,6 +140,7 @@
 
 #ifdef __VINYLCONTROL__
     connect(wvinylcontrol, SIGNAL(refreshVCProxies()), wsound, SLOT(forceApply()));
+    connect(wvinylcontrol, SIGNAL(applySound()), wsound, SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()), wvinylcontrol,    SLOT(slotApply())); //It's important for this to be before the
                                                                                  //connect for wsound...
 #endif
@@ -170,7 +177,7 @@
     m_pSoundButton->setText(0, tr("Sound Hardware"));
     m_pSoundButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pSoundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    
+
 /*
     QTreeWidgetItem * midiButton = new QTreeWidgetItem(contentsTreeWidget);
     midiButton->setIcon(0, QIcon(":/images/preferences/controllers.png"));
@@ -242,6 +249,14 @@
     m_pVinylControlButton->setText(0, tr("Vinyl Control"));
     m_pVinylControlButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pVinylControlButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#else
+    m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
+    //QT screws up my nice vinyl svg for some reason, so we'll use a PNG version
+    //instead...
+    m_pVinylControlButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_vinyl.png"));
+    m_pVinylControlButton->setText(0, tr("Vinyl Control"));
+    m_pVinylControlButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
+    m_pVinylControlButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 #endif
 
 #ifdef __SHOUTCAST__
@@ -277,11 +292,14 @@
        else if (current == m_pBPMdetectButton)
            pagesWidget->setCurrentWidget(wbpm);
        else if (current == m_pReplayGainButton)
-    	   pagesWidget->setCurrentWidget(wreplaygain);
+           pagesWidget->setCurrentWidget(wreplaygain);
 
 #ifdef __VINYLCONTROL__
        else if (current == m_pVinylControlButton)
            pagesWidget->setCurrentWidget(wvinylcontrol);
+#else
+       else if (current == m_pVinylControlButton)
+           pagesWidget->setCurrentWidget(wnovinylcontrol);
 #endif
 #ifdef __SHOUTCAST__
        else if (current == m_pShoutcastButton)

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2010-10-29 13:22:37 +0000
+++ mixxx/src/dlgpreferences.h	2011-04-22 09:04:29 +0000
@@ -42,11 +42,13 @@
 class DlgPrefRecord;
 class DlgPrefBpm;
 class DlgPrefVinyl;
+class DlgPrefNoVinyl;
 class DlgPrefShoutcast;
 class DlgPrefReplayGain;
 class PowerMate;
 class MidiDeviceManager;
 class SkinLoader;
+class PlayerManager;
 
 /**
   *@author Tue & Ken Haste Andersen
@@ -57,7 +59,9 @@
     Q_OBJECT
 public:
     DlgPreferences(MixxxApp *mixxx, SkinLoader* pSkinLoader, SoundManager *soundman,
-                   MidiDeviceManager* midi, ConfigObject<ConfigValue> *config);
+                   PlayerManager* pPlayerManager, MidiDeviceManager* midi,
+                   ConfigObject<ConfigValue> *config);
+
     ~DlgPreferences();
     void createIcons();
 public slots:
@@ -86,19 +90,20 @@
     DlgPrefRecord *wrecord;
     DlgPrefBpm *wbpm;
     DlgPrefVinyl *wvinylcontrol;
+    DlgPrefNoVinyl *wnovinylcontrol;
     DlgPrefShoutcast *wshoutcast;
     DlgPrefReplayGain *wreplaygain;
 
-	QTreeWidgetItem* m_pSoundButton;
-	QTreeWidgetItem* m_pPlaylistButton;
-	QTreeWidgetItem* m_pControlsButton;
-	QTreeWidgetItem* m_pEqButton;
-	QTreeWidgetItem* m_pCrossfaderButton;
-	QTreeWidgetItem* m_pRecordingButton;
-	QTreeWidgetItem* m_pBPMdetectButton;
-	QTreeWidgetItem* m_pVinylControlButton;
-	QTreeWidgetItem* m_pShoutcastButton;
-	QTreeWidgetItem* m_pReplayGainButton;
+    QTreeWidgetItem* m_pSoundButton;
+    QTreeWidgetItem* m_pPlaylistButton;
+    QTreeWidgetItem* m_pControlsButton;
+    QTreeWidgetItem* m_pEqButton;
+    QTreeWidgetItem* m_pCrossfaderButton;
+    QTreeWidgetItem* m_pRecordingButton;
+    QTreeWidgetItem* m_pBPMdetectButton;
+    QTreeWidgetItem* m_pVinylControlButton;
+    QTreeWidgetItem* m_pShoutcastButton;
+    QTreeWidgetItem* m_pReplayGainButton;
     QTreeWidgetItem* m_pMIDITreeItem;
     QList<QTreeWidgetItem*> m_midiBindingsButtons;
 

=== added file 'mixxx/src/dlgprefnovinyl.cpp'
--- mixxx/src/dlgprefnovinyl.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnovinyl.cpp	2011-04-22 09:04:29 +0000
@@ -0,0 +1,32 @@
+/***************************************************************************
+                          DlgPrefNoVinyl.cpp  -  description
+                             -------------------
+    begin                : Thu Feb 24 2011
+    copyright            : (C) 2011 by Owen Williams
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+
+#include <QtCore>
+#include <QtDebug>
+#include <QtGui>
+#include "dlgprefnovinyl.h"
+
+DlgPrefNoVinyl::DlgPrefNoVinyl(QWidget * parent, SoundManager * soundman,
+                           ConfigObject<ConfigValue> * _config) : QWidget(parent), Ui::DlgPrefNoVinylDlg()
+{
+    setupUi(this);
+}
+
+DlgPrefNoVinyl::~DlgPrefNoVinyl()
+{
+}

=== added file 'mixxx/src/dlgprefnovinyl.h'
--- mixxx/src/dlgprefnovinyl.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnovinyl.h	2011-04-22 09:04:29 +0000
@@ -0,0 +1,39 @@
+/***************************************************************************
+                          dlgprefnovinyl.h  -  description
+                             -------------------
+    begin                : Thu Feb 24 2011
+    copyright            : (C) 2011 by Owen Williams
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DLGPREFNOVINYL_H
+#define DLGPREFNOVINYL_H
+
+#include "ui_dlgprefnovinyldlg.h"
+#include "configobject.h"
+
+class QWidget;
+class SoundManager;
+
+/**
+  *@author Stefan Langhammer
+  *@author Albert Santoni
+  */
+
+class DlgPrefNoVinyl : public QWidget, Ui::DlgPrefNoVinylDlg  {
+    Q_OBJECT
+public:
+    DlgPrefNoVinyl(QWidget *parent, SoundManager* soundman, ConfigObject<ConfigValue> *_config);
+    ~DlgPrefNoVinyl();
+};
+
+#endif

=== added file 'mixxx/src/dlgprefnovinyldlg.ui'
--- mixxx/src/dlgprefnovinyldlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnovinyldlg.ui	2011-04-22 09:04:29 +0000
@@ -0,0 +1,475 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefNoVinylDlg</class>
+ <widget class="QWidget" name="DlgPrefNoVinylDlg">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>514</width>
+    <height>547</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form1</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Input</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="devicesLabel">
+        <property name="text">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Select sound devices for vinyl control in the Sound Hardware pane.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>&lt;a href=&quot;http://www.mixxx.org/wiki/doku.php/vinyl_control#troubleshooting&quot;&gt;Troubleshooting&lt;/a&gt;</string>
+        </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="textLabel1_3">
+          <property name="text">
+           <string>Turntable Preamp</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="VinylGain">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>150</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>100</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="textLabel2">
+          <property name="text">
+           <string>1 (Off)</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="textLabel3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>150</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Vinyl Configuration</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel29">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Deck 1 Vinyl Type</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="ComboBoxVinylType1">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="ComboBoxVinylSpeed1">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel28">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Deck 2 Vinyl Type</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QComboBox" name="ComboBoxVinylType2">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QComboBox" name="ComboBoxVinylSpeed2">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel2_2">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Lead-in time</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLineEdit" name="LeadinTime">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="TextLabel2_2_2">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>seconds</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" rowspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Control Mode</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <layout class="QVBoxLayout">
+      <item>
+       <widget class="QRadioButton" name="AbsoluteMode">
+        <property name="text">
+         <string>Absolute Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RelativeMode">
+        <property name="text">
+         <string>Relative Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="NeedleSkipEnable">
+        <property name="text">
+         <string>Enable Needle Skip Prevention</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="2">
+    <widget class="QGroupBox" name="groupBoxSignalQuality">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Signal Quality</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>http://www.xwax.co.uk</string>
+     </property>
+     <property name="text">
+      <string>Powered by xwax</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QPushButton" name="applyButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>85</width>
+       <height>27</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Apply</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>&lt;b&gt;This version of Mixxx does not support vinyl control.&lt;/b&gt; &lt;br&gt; Please visit &lt;a href=&quot;http://mixxx.org&quot;&gt;Mixxx.org&lt;/a&gt; for more information.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'mixxx/src/dlgprefrecord.cpp'
--- mixxx/src/dlgprefrecord.cpp	2011-01-21 12:41:27 +0000
+++ mixxx/src/dlgprefrecord.cpp	2011-04-22 09:04:29 +0000
@@ -23,114 +23,114 @@
 #include "controlobjectthreadmain.h"
 #include "recording/encoder.h"
 
+
 DlgPrefRecord::DlgPrefRecord(QWidget * parent, ConfigObject<ConfigValue> * _config) : QWidget(parent), Ui::DlgPrefRecordDlg()
 {
     config = _config;
     confirmOverwrite = false;
+    radioFlac = 0;
+    radioMp3 = 0;
+    radioOgg = 0;
+    radioAiff= 0;
+    radioWav = 0;
+
 
     setupUi(this);
 
     recordControl = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Master]", "Record"))); //See RECORD_* #defines in defs_recording.h
 
-	
-    //Fill up encoding list
-    comboBoxEncoding->addItem(ENCODING_WAVE);
-#ifdef SF_FORMAT_FLAC
-    comboBoxEncoding->addItem(ENCODING_FLAC);
-#endif
-    comboBoxEncoding->addItem(ENCODING_AIFF);
-#ifdef __SHOUTCAST__
-    comboBoxEncoding->addItem(ENCODING_MP3);
-    comboBoxEncoding->addItem(ENCODING_OGG);
-#endif
-
-	int encodingIndex = comboBoxEncoding->findText(config->getValueString(ConfigKey("[Recording]","Encoding")));
-    if (encodingIndex >= 0)
-        comboBoxEncoding->setCurrentIndex(encodingIndex);
+
+
+#ifdef __SHOUTCAST__
+    radioOgg = new QRadioButton("Ogg Vorbis");
+    radioMp3 = new QRadioButton(ENCODING_MP3);
+    connect(radioOgg,SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+    connect(radioMp3, SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+    horizontalLayout->addWidget(radioOgg);
+    horizontalLayout->addWidget(radioMp3);
+
+#endif
+
+    //AIFF and WAVE are supported by default
+    radioWav = new QRadioButton(ENCODING_WAVE);
+    connect(radioWav, SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+    horizontalLayout->addWidget(radioWav);
+
+    radioAiff = new QRadioButton(ENCODING_AIFF);
+    connect(radioAiff, SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+    horizontalLayout->addWidget(radioAiff);
+
+
+#ifdef SF_FORMAT_FLAC
+    radioFlac = new QRadioButton(ENCODING_FLAC);
+    connect(radioFlac,SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+    horizontalLayout->addWidget(radioFlac);
+#endif
+
+    //Read config and check radio button
+    QString format = config->getValueString(ConfigKey("[Recording]","Encoding"));
+    if(format == ENCODING_WAVE)
+        radioWav->setChecked(true);
+#ifdef __SHOUTCAST__
+    else if(format == ENCODING_OGG)
+        radioOgg->setChecked(true);
+    else if (format == ENCODING_MP3)
+        radioMp3->setChecked(true);
+#endif
+#ifdef SF_FORMAT_FLAC
+    else if (format == ENCODING_AIFF)
+        radioAiff->setChecked(true);
+#endif
     else //Invalid, so set default and save
     {
-        comboBoxEncoding->setCurrentIndex(0);
-        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(comboBoxEncoding->currentText()));
+        //If no config was available, set to WAVE as default
+        radioWav->setChecked(true);
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_WAVE));
     }
 
     //Connections
-    connect(PushButtonBrowse, SIGNAL(clicked()),        this,   SLOT(slotBrowseSave()));
-    connect(PushButtonBrowseCue, SIGNAL(clicked()),        this,   SLOT(slotBrowseCueSave()));
-    connect(LineEditRecPath,  SIGNAL(returnPressed()),  this,   SLOT(slotApply()));
-    connect(comboBoxEncoding, SIGNAL(activated(int)),   this,   SLOT(slotRecordPathChange()));
     connect(SliderQuality,    SIGNAL(valueChanged(int)), this,  SLOT(slotSliderQuality()));
     connect(SliderQuality,    SIGNAL(sliderMoved(int)), this,   SLOT(slotSliderQuality()));
     connect(SliderQuality,    SIGNAL(sliderReleased()), this,   SLOT(slotSliderQuality()));
     connect(CheckBoxRecordCueFile, SIGNAL(stateChanged(int)), this, SLOT(slotEnableCueFile(int)));
-    connect(LineEditRecPath, SIGNAL(textChanged(QString)), this, SLOT(slotRecordPathChanged(QString)));
+    connect(comboBoxSplitting, SIGNAL(activated(int)),   this,   SLOT(slotChangeSplitSize()));
 
     slotApply();
     recordControl->slotSet(RECORD_OFF); //make sure a corrupt config file won't cause us to record constantly
-}
-
-void DlgPrefRecord::slotBrowseSave()
-{
-    QString encodingType = comboBoxEncoding->currentText();    
-    QString encodingFileFilter = QString("Audio (*.%1)").arg(encodingType);
-    QString selectedFile = QFileDialog::getSaveFileName(NULL, tr("Save Recording As..."), config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Path")), encodingFileFilter);
-    if (selectedFile.toLower() != "")
-    {
-        if(!selectedFile.toLower().endsWith("." + encodingType.toLower()))
-        {
-            selectedFile.append("." + encodingType.toLower());
-        }        
-        LineEditRecPath->setText( selectedFile );
-    }
-}
-
-void DlgPrefRecord::slotBrowseCueSave()
-{
-    QString encodingFileFilter = QString("CUE file (*.cue)");
-    QString selectedFile = QFileDialog::getSaveFileName(NULL, tr("Save Cue File As..."), config->getValueString(ConfigKey(RECORDING_PREF_KEY,"CuePath")), encodingFileFilter);
-    if (selectedFile.toLower() != "")
-    {
-        if(!selectedFile.toLower().endsWith(".cue"))
-        {
-            selectedFile.append(".cue");
-        }        
-        LineEditCuePath->setText( selectedFile );
-    }
-}
-
-void DlgPrefRecord::slotEnableCueFile(int enabled)
-{
-    bool status = enabled ? true : false;
-
-
-    config->set(ConfigKey(RECORDING_PREF_KEY, "CueEnabled"), ConfigValue(CheckBoxRecordCueFile->isChecked()));
-
-    LabelCueFile->setEnabled(status);
-    LineEditCuePath->setEnabled(status);
-    PushButtonBrowseCue->setEnabled(status);
-}
-
-void DlgPrefRecord::slotRecordPathChanged(QString path)
-{
-    QString cuePath = path;
-    int pos;
-
-
-    pos = path.lastIndexOf(".");
-    cuePath.replace(pos, 4, ".cue");
-    cuePath.truncate(pos + 4);
-
-    LineEditCuePath->setText(cuePath);
+
+    comboBoxSplitting->addItem(SPLIT_650MB);
+    comboBoxSplitting->addItem(SPLIT_700MB);
+    comboBoxSplitting->addItem(SPLIT_1024MB);
+    comboBoxSplitting->addItem(SPLIT_2048MB);
+    comboBoxSplitting->addItem(SPLIT_4096MB);
+
+    QString fileSizeStr = config->getValueString(ConfigKey("[Recording]","FileSize"));
+    int index = comboBoxSplitting->findText(fileSizeStr);
+    if(index > 0){
+        //set file split size
+        comboBoxSplitting->setCurrentIndex(index);
+    }
+    //Otherwise 650 MB will be default file split size
+
+    //Read CUEfile info
+    CheckBoxRecordCueFile->setChecked((bool) config->getValueString(ConfigKey("[Recording]","CueEnabled")).toInt());
+
 }
 
 void DlgPrefRecord::slotSliderQuality()
 {
     updateTextQuality();
-    QString encodingType = comboBoxEncoding->currentText();
-    if (encodingType == "OGG")
+
+    if (radioOgg && radioOgg->isChecked())
     {
         config->set(ConfigKey(RECORDING_PREF_KEY, "OGG_Quality"), ConfigValue(SliderQuality->value()));
     }
-    else if (encodingType == "MP3")
+    else if (radioMp3 && radioMp3->isChecked())
     {
         config->set(ConfigKey(RECORDING_PREF_KEY, "MP3_Quality"), ConfigValue(SliderQuality->value()));
     }
@@ -138,52 +138,61 @@
 
 int DlgPrefRecord::getSliderQualityVal()
 {
-	
-	/* Commented by Tobias Rafreider
-	 * We always use the bitrate to denote the quality since it is more common to the users
-	 */
-	return Encoder::convertToBitrate(SliderQuality->value());
+
+    /* Commented by Tobias Rafreider
+     * We always use the bitrate to denote the quality since it is more common to the users
+     */
+    return Encoder::convertToBitrate(SliderQuality->value());
 
 }
 
 void DlgPrefRecord::updateTextQuality()
 {
     int quality = getSliderQualityVal();
-    QString encodingType = comboBoxEncoding->currentText();
-    
+    //QString encodingType = comboBoxEncoding->currentText();
+
     TextQuality->setText(QString( QString::number(quality) + tr("kbps")));
-    
-    
+
+
 }
 
 void DlgPrefRecord::slotEncoding()
 {
     //set defaults
     groupBoxQuality->setEnabled(true);
-    config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(comboBoxEncoding->currentText()));
-    if (comboBoxEncoding->currentText() == ENCODING_WAVE || 
-        comboBoxEncoding->currentText() == ENCODING_FLAC ||
-        comboBoxEncoding->currentText() == ENCODING_AIFF)
-    {
-        groupBoxQuality->setEnabled(false);
-    }
-    else if (comboBoxEncoding->currentText() == ENCODING_OGG)
+    //config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(comboBoxEncoding->currentText()));
+
+    if (radioWav && radioWav->isChecked()) {
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_WAVE));
+        groupBoxQuality->setEnabled(false);
+    }
+    else if(radioFlac && radioFlac->isChecked()){
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_FLAC));
+        groupBoxQuality->setEnabled(false);
+    }
+    else if(radioAiff && radioAiff->isChecked()){
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_AIFF));
+        groupBoxQuality->setEnabled(false);
+    }
+    else if (radioOgg && radioOgg->isChecked())
     {
         int value = config->getValueString(ConfigKey(RECORDING_PREF_KEY, "OGG_Quality")).toInt();
         //if value == 0 then a default value of 128kbps is proposed.
         if(!value)
             value = 6; // 128kbps
-        
+
         SliderQuality->setValue(value);
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_OGG));
     }
-    else if (comboBoxEncoding->currentText() == ENCODING_MP3)
+    else if (radioMp3 && radioMp3->isChecked())
     {
         int value = config->getValueString(ConfigKey(RECORDING_PREF_KEY, "MP3_Quality")).toInt();
         //if value == 0 then a default value of 128kbps is proposed.
         if(!value)
             value = 6; // 128kbps
-        
+
         SliderQuality->setValue(value);
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_MP3));
     }
     else
         qDebug() << "Invalid recording encoding type in" << __FILE__ << "on line:" << __LINE__;
@@ -216,26 +225,42 @@
 //This function updates/refreshes the contents of this dialog
 void DlgPrefRecord::slotUpdate()
 {
-    int encodingIndex = comboBoxEncoding->findText(config->getValueString(ConfigKey("[Recording]","Encoding")));
-    if (encodingIndex >= 0)
-        comboBoxEncoding->setCurrentIndex(encodingIndex);
-    else //Invalid, so set default and save
-    {
-        comboBoxEncoding->setCurrentIndex(0);
-        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(comboBoxEncoding->currentText()));
-    }
-    
-    //Set the path from the saved value.
-    LineEditRecPath->setText(config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Path")));
-    
+    if (radioWav && radioWav->isChecked())
+    {
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_WAVE));
+    }
+    else if (radioAiff && radioAiff->isChecked())
+    {
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_AIFF));
+    }
+    else if (radioFlac && radioFlac->isChecked())
+    {
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_FLAC));
+    }
+    else if (radioOgg && radioOgg->isChecked())
+    {
+        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_OGG));
+    }
+    else if (radioMp3 && radioMp3->isChecked())
+    {
+       config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_MP3));
+    }
     loadMetaData();
 }
 
 void DlgPrefRecord::slotApply()
 {
-    config->set(ConfigKey(RECORDING_PREF_KEY, "Path"), LineEditRecPath->text());
-    config->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), LineEditCuePath->text());
     setMetaData();
 
     slotEncoding();
 }
+void DlgPrefRecord::slotEnableCueFile(int enabled)
+{
+    config->set(ConfigKey(RECORDING_PREF_KEY, "CueEnabled"), ConfigValue(CheckBoxRecordCueFile->isChecked()));
+
+}
+void DlgPrefRecord::slotChangeSplitSize()
+{
+        config->set(ConfigKey(RECORDING_PREF_KEY, "FileSize"), ConfigValue(comboBoxSplitting->currentText()));
+
+}

=== modified file 'mixxx/src/dlgprefrecord.h'
--- mixxx/src/dlgprefrecord.h	2011-01-21 12:41:27 +0000
+++ mixxx/src/dlgprefrecord.h	2011-04-22 09:04:29 +0000
@@ -20,6 +20,7 @@
 
 #include "ui_dlgprefrecorddlg.h"
 #include "configobject.h"
+#include <QRadioButton>
 
 class ControlObject;
 class ControlObjectThreadMain;
@@ -39,27 +40,30 @@
 public slots:
     /** Apply changes to widget */
     void slotApply();
-	void slotUpdate();
-    void slotBrowseSave();
-    void slotBrowseCueSave();
-    void slotEnableCueFile(int);
-    void slotRecordPathChanged(QString);
+    void slotUpdate();
     void slotEncoding();
     void slotSliderQuality();
     void slotRecordPathChange();
-    int getSliderQualityVal();
-    void updateTextQuality();
+    void slotEnableCueFile(int);
+    void slotChangeSplitSize();
 signals:
     void apply(const QString &);
 private:
     void setMetaData();
     void loadMetaData();
+    int getSliderQualityVal();
+    void updateTextQuality();
     
     /** Pointer to config object */
     ConfigObject<ConfigValue> *config;
     ControlObjectThreadMain* recordControl;
     bool confirmOverwrite;
     QString fileTypeExtension;
+    QRadioButton *radioOgg;
+    QRadioButton *radioMp3;
+    QRadioButton *radioAiff;
+    QRadioButton *radioFlac;
+    QRadioButton *radioWav;
 };
 
 #endif

=== modified file 'mixxx/src/dlgprefrecorddlg.ui'
--- mixxx/src/dlgprefrecorddlg.ui	2011-01-21 12:41:27 +0000
+++ mixxx/src/dlgprefrecorddlg.ui	2011-04-22 09:04:29 +0000
@@ -1,316 +1,229 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgPrefRecordDlg</class>
- <widget class="QWidget" name="DlgPrefRecordDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>412</width>
-    <height>411</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form3</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="TextLabel3_2">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="font">
-        <font/>
-       </property>
-       <property name="text">
-        <string>File</string>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLineEdit" name="LineEditRecPath">
-       <property name="font">
-        <font/>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QPushButton" name="PushButtonBrowse">
-       <property name="font">
-        <font/>
-       </property>
-       <property name="text">
-        <string>Browse...</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="TextLabel3_2_2">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="font">
-        <font/>
-       </property>
-       <property name="text">
-        <string>Encoding</string>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2" colspan="2">
-      <widget class="QComboBox" name="comboBoxEncoding"/>
-     </item>
-     <item row="0" column="1">
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="1" column="1">
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBoxQuality">
-     <property name="title">
-      <string>Quality</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="2">
-       <widget class="QLabel" name="TextQuality">
-        <property name="text">
-         <string>Quality</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>