Merge lp:~ywwg/mixxx/features_xwax2 into lp:~mixxxdevelopers/mixxx/trunk

[Owen Williams]

This branch revamps vinyl control. It:

* updates xwax to the latest version
* makes changes to the engine code to support prerolling of tracks (positions < 0)
* tweaks some of the UI widgets (multistate buttons, multistate lights)
* rewrites the vinyl control code
* rewrites the linear scalar to work better

[RJ Skerry-Ryan (rryan)]

This doesn't merge cleanly with the latest trunk. Can you please merge with trunk? The entire SConscript was refactored. It looks like from your diff, you only added two lines to the SConscript. I've produced a diff of what you need to change in the new SConscript based on that. When you merge with trunk, only SConscript.env will be conflicted. Replace whatever is in your copy with the trunk version, and apply this patch to mixxx/build/features.py:

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py 2010-10-06 18:34:43 +0000
+++ mixxx/build/features.py 2010-10-06 23:20:56 +0000
@@ -198,6 +198,8 @@
             sources.append("#lib/xwax/timecoder_win32.c")
         else:
             sources.append("#lib/xwax/timecoder.c")
+ sources.append("#lib/xwax/lut.c")
+ sources.append("#lib/xwax/pitch.c")
         return sources

 class Tonal(Feature):

[RAFFI TEA (raffitea)]

Does it also compile on Windows?

[Owen Williams (ywwg)]

> Does it also compile on Windows?
I think the new version of xwax needs to be checked. In the existing trunk, there's a _win32 file that was created, but I don't know how. It might need to be recreated for the new version. You could always try compiling it and see what happens :)

[Albert Santoni (gamegod)]

There's a bunch of C99 stuff in the original timecoder.c that I fixed
to compile with MSVC on Windows (no C99). Mainly, I remember it was
declaration of the timecoder struct. It should be mergeable by eye,
and I'll do it when I get around to building the branch on Windows if
someone else doesn't beat me to it.

On Wed, Oct 13, 2010 at 5:33 AM, Owen Williams <email address hidden> wrote:
>> Does it also compile on Windows?
> I think the new version of xwax needs to be checked.  In the existing trunk, there's a _win32 file that was created, but I don't know how.  It might need to be recreated for the new version.  You could always try compiling it and see what happens :)
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> Your team Mixxx Development Team is requested to review the proposed merge of lp:~ywwg/mixxx/features_xwax2 into lp:mixxx.
>

[Phillip Whelan (pwhelan)]

There are also some other issues that I know your code has or had:

  * Enabling Vinyl Control on one deck sometimes locks up the other
  * Old Skins or skins that are not updated to account for your widget
changes crash mixxx.

I'll check out your latest version of the branch to see if these are fixed.

[lp:~ywwg/mixxx/features_xwax2]

2474. By Owen Williams <owen@ywwg> on 2010-10-15

* merge from trunk and fix conflicts

2475. By Owen Williams <owen@ywwg> on 2010-10-18

* we don't need to worry about device problems here (I think?)

2476. By Owen Williams <owen@ywwg> on 2010-10-19

* merge from trunk -- ugh, tough merge

2477. By Owen Williams <owen@ywwg> on 2010-10-20

* fix startup crash. Don't try to initialize cotnrolobject values right after creating the threads

2478. By Owen Williams <owen@ywwg> on 2010-10-20

* fix pushbuttons to work with multistate pushbutton widgets
* fix pushbuttons so that toggles work with midi controllers that do toggling (nanokontrol)
* fix vinyl code so that it's not specific to my nanokontrol setup
* simplify mode-switching code: don't allow switch to ABS mode if playing and needleskip prevention is on

2479. By Owen Williams <owen@ywwg> on 2010-10-21

* merge with trunk, fix conflicts

2480. By Owen Williams <owen@ywwg> on 2010-10-24

* merge from lp:mixxx

2481. By Owen Williams <owen@ywwg> on 2010-10-24

* fix vinyl control checkboxes not working

2482. By Owen Williams <email address hidden> on 2010-10-26

* merge from lp:mixxx

2483. By Owen Williams <email address hidden> on 2010-11-01

* merge from lp:mixxx
* adapted to new pref dialog design
* adapted vinyl code to work with new n-deck design.

2484. By Owen Williams <email address hidden> on 2010-11-01

* remove my personal library unscanner hack

2485. By Owen Williams <email address hidden> on 2010-11-01

* merge with crazy fast-moving lp:mixxx

[Albert Santoni (gamegod)]

Notes from an email conversation between Owen and I:

- Keyboard controls are a bit busted due to modifications made to controlpushbutton.cpp. Should probably revert these and find a better solution to Owen's MIDI problems another way.

- Must change the vinyl control code to be able to deal with a single deck set on any of the inputs, or figure out just how this should work in general. The solution must be generalizable to N-decks of vinyl control input, so we probably don't want to hardcode "Deck 1" as a magic deck.
- Should also figure out oddball cases like what happens if you have two decks of input and 3 players in Mixxx. How does the routing work?

review: Needs Fixing

[lp:~ywwg/mixxx/features_xwax2]

2486. By Owen Williams <email address hidden> on 2010-11-01

* redo vinyl input mapping to support arbitrary numbers of decks
* to enable "single deck mode" set both decks to the same set of inputs

2487. By Owen Williams <email address hidden> on 2010-11-02

* fix constant mode playback speed

2488. By Owen Williams <email address hidden> on 2010-11-02

* fix incorrect comments
* fix enable/disable of vinyl mode to be smooth and glitch-free

2489. By Owen Williams <email address hidden> on 2010-11-02

* fix wstatuslights

2490. By Owen Williams <email address hidden> on 2010-11-03

* merge from lp:mixxx

[Albert Santoni (gamegod)]

- The guy who made the Trancer skin originally had another skin which

was completely ripped off from Traktor. In addition, the Trancer skin

has been removed from KDE-Look, so I'd prefer to err on the side of

caution and not include the Trancer skin. It's probably ripped off

from somewhere, I just don't know where yet.

- I had previously patched timecoder.c to make it store the lookup

table in the timecoder struct. This is absolutely necessary otherwise

you end up with a race condition because the code isn't thread safe and you will get crashes and all sorts of weird problems.

(eg. compare the new timecoder_free_lookup() with mine)

- Can the "enable vinyl control" menu items be moved into a submenu off the Options menu like :

Options
  Vinyl Control -> Enable Deck 1
                   Enable Deck 2

- Launchpad is wrong, the diff is incomplete (why??) so this is not a full review yet.

- VinylModeSwitch.js - What does this do?

- I can't get taglib built on Windows with MSVC so I haven't had a chance to try to get the new xwax code building on Windows.

review: Needs Fixing

[lp:~ywwg/mixxx/features_xwax2]

2491. By Owen Williams <email address hidden> on 2010-11-06

* remove unneeded javascript file

[Owen Williams (ywwg)]

> - Launchpad is wrong, the diff is incomplete (why??) so this is not a full review yet.

what do you mean the diff is incomplete?

>
> - VinylModeSwitch.js - What does this do?

that was a workaround I was using for a while. It's deprecated so I'll
remove it.

> - I had previously patched timecoder.c to make it store the lookup
>
> table in the timecoder struct. This is absolutely necessary otherwise
>
> you end up with a race condition because the code isn't thread safe and you will get crashes and all sorts of weird problems.
>
> (eg. compare the new timecoder_free_lookup() with mine)
>

I don't think this needs to be done again. Looking in the newer xwax, it already is storing the def in the timecoder, and the def stores the lookup table in itself. It looks to me like it's doing what you describe. (That and it doesn't crash or give me weird problems)

[lp:~ywwg/mixxx/features_xwax2]

2492. By Owen Williams <email address hidden> on 2010-11-06

* move vinyl control options to submenu

2493. By Owen Williams <email address hidden> on 2010-11-06

* when turning off vinyl control, set play button based on current speed

2494. By Owen Williams <email address hidden> on 2010-11-06

* removed infringing skin
* modified outlinenetbook with basic vinyl indicators and buttons

[Albert Santoni (gamegod)]

> > - Launchpad is wrong, the diff is incomplete (why??) so this is not a full
> review yet.
>
> what do you mean the diff is incomplete?
>

The diff that Launchpad generated doesn't seem to have all the changes that you made in your branch, for whatever reason (eg. it was missing the vinylcontrolxwax.cpp changes). Anyways, looks like it's been fixed now.

> >
> > - VinylModeSwitch.js - What does this do?
>
> that was a workaround I was using for a while. It's deprecated so I'll
> remove it.

Ok, thanks!

>
>
> > - I had previously patched timecoder.c to make it store the lookup
> >
> > table in the timecoder struct. This is absolutely necessary otherwise
> >
> > you end up with a race condition because the code isn't thread safe and you
> will get crashes and all sorts of weird problems.
> >
> > (eg. compare the new timecoder_free_lookup() with mine)
> >
>
> I don't think this needs to be done again. Looking in the newer xwax, it
> already is storing the def in the timecoder, and the def stores the lookup
> table in itself. It looks to me like it's doing what you describe. (That and
> it doesn't crash or give me weird problems)

The problem is that the timecode_def array is a global variable in timecoder.c. When we build the lookup table in both our VinylControlXwax threads, they can be concurrently writing to the same memory, in that timecode_def array. As well, when we free the lookup table, we're double-freeing the same memory. It's a subtle problem but it will cause crashes. You probably won't see it most of the time because it's a race condition.

The code has diverged mainly with the addition of this lut struct to timecode_def_t. Not sure if it's better to go back and merge our old timecoder.c with the latest one or whether I should try to redo all the changes from scratch to make it re-entrant again.

[Albert Santoni (gamegod)]

After staring at the xwax code for a while, I think it's going to be quite a bit of work to get the changes right, and in the end it would probably result in another forked piece of code (hard to maintain).

I think what I'm going to do is modify vinylcontrolxwax.cpp to wrap the stock timecoder.c in a way make it thread-safe. We will lose the ability to have different timecode types on different decks because of this, but it's a restriction of xwax right now. (My modifications from before overcame this, but it's probably not worth maintaining.)

I'll see how this goes...

[Albert Santoni (gamegod)]

void EngineBufferScaleLinear::setBaseRate(double dBaseRate)

- Why did you add the isNan checks here? Were you seeing NaNs appearing in this code? (If so, it might have been a symptom of a bigger problem...)

[lp:~ywwg/mixxx/features_xwax2]

2495. By Owen Williams <email address hidden> on 2010-11-06

* remove old isNan workaround

2496. By Owen Williams <email address hidden> on 2010-11-06

* remove library changes that shouldn't be in this branch

2497. By Owen Williams <email address hidden> on 2010-11-06

* merge from lp:mixxx

[Sean M. Pappalardo (pegasus-renegadetech)]

xwax v0.8 is to be released very soon: http://www.xwax.co.uk/releases/xwax-0.8.tar.gz

Is it worth updating to that version before merging this?

[Owen Williams (ywwg)]

Yeah it's worth trying to merge that in. It looks like the API hasn't changed a lot so it shouldn't be that hard.

[Albert Santoni (gamegod)]

In my features_xwax2_albert branch, tonight I fixed:
- keyboard and MIDI buttons on my controllers (basically reverted the behaviour in ControlPushButton)
- a crash in VinylControlXwax due to the code stepping out of bounds in the dPitch ringbuffer:

                 if(ringPos++ > RING_SIZE)

ringPos++ returns "ringPos" then increments the value. ++ringPos would have done what you wanted, but I've just the ringPos++ before the if statement so it's less confusing for the next person who looks at this code.

I also fixed a bug in trunk where channel pairs with non-even base numbers could be selected (like channels 2-3 instead of 3-4), which was preventing me from using my second input pair.

What else do we need to fix?

[lp:~ywwg/mixxx/features_xwax2]

2498. By Owen Williams <email address hidden> on 2010-11-08

* merge from lp:~mixxxdevelopers/mixxx/features_xwax2_albert:
* Fixed out-of-bounds array access in VinylControlXwax ringbuffer.
* Fixed MIDI buttons and keyboard buttons for most controllers.
* Renamed xwax files to .cpp to make Visual Studio compile them as C++. (This is easier than re-implementing missing C99 stuf$
* Instead of re-implementing re-entrancy modifications in xwax's timecoder, I wrapped the relevent code in a static mutex, wh$
* New xwax vinyl control code compiles on Windows now

* also update xwax to 0.8
* fix compilation under linux (as opposed to windows)

2499. By Owen Williams <email address hidden> on 2010-11-10

* restore my the "safe" values I found work better

2500. By Owen Williams <email address hidden> on 2010-11-10

* don't resync if near start of track (prevents annoying jumping)

2501. By Owen Williams <email address hidden> on 2010-11-10

* aw hell, typo

2502. By Owen Williams <email address hidden> on 2010-11-10

* merge from lp:mixxx

[William Good (bkgood)]

Owen- it looks like you got this in your latest merge, but your SoundManager code may need updated. I changed SoundDevice to not error when it gets an AudioInput whose channels overlap with another Input. This way, a user can send audio input from DevX Channels 1-2 to vinyl control 1 and 2 and then the VC code can decide which deck to apply that vinyl control signal to (I'm guessing that's what you're doing?). This should make your life in SoundManager a little easier.

[Owen Williams (ywwg)]

Actually... I was kind of relying on that error :). I have to build a map of the vinyl inputs, and if I get no error, then I know it's a new set of inputs. If I get an error, then I know it's a duplicate set of inputs and I have to find the previous inputs it corresponds to.

I think I can rewrite the test pretty easily, though, and this will be not as hacky.

[lp:~ywwg/mixxx/features_xwax2]

2503. By Owen Williams <email address hidden> on 2010-11-11

* duplicate_inputs is no longer used at all, so remove it completely

[RAFFI TEA (raffitea)]

Owen, I'd like to test on Windows but I can't check out your branch with 'bzr branch ...'
There's a file called 'lut.cpp' in lib/xwax which is a symbolic link. BZR on Windows does not support symbolic links. Please resolve that problem!

Thanks,

Tobias

[Owen Williams (ywwg)]

ok fixed. It's just a duplicate of lut.c. I thought perhaps bzr would be smart enough to compensate for that on windows

[lp:~ywwg/mixxx/features_xwax2]

2504. By Owen Williams <email address hidden> on 2010-11-13

* remove symbolic link for compatibility on windows

2505. By Owen Williams <email address hidden> on 2010-11-13

* fix bug causing static in linear scaler

2506. By Owen Williams <email address hidden> on 2010-11-14

* merge from lp:mixxx

[JWC (jwc)]

With QT 4.7.1 (current version in Arch Linux repositories), I experience segfaults whenever I try to change something very quickly. Examples include moving a knob quickly (both through a MIDI controller and with a mouse), scratching (i.e. moving the waveform quickly), and anything else that modifies the GUI rapidly.

Here's a backtrace:
http://f.jwcxz.com/mixxx.bt

It looks like the problem is with QPixmap::isNull().

The second issue that I found was that after the segfault occurs, vinyl control is broken when I start up Mixxx again. To fix it, I need to go into the audio i/o preferences, change some value and change it back again (to enable the "Apply" button) and then click "Apply." This will allow the vinyl controller to work again (turning vinyl control off and back on again without doing this doesn't have any effect).

The third issue was that the gain bars in the vinyl control setup page don't seem to be showing any activity (they just show the grid background).

Lastly, as I understand it, scratch mode has been disabled. So, the option for it should be removed from the vinyl control options in the preferences.

[JWC (jwc)]

I completely forgot another bug that I experienced. When I have
"Pitch/Rate slider direction" set to "Down increases speed" in the
Interface tab of the preferences, the vinyl control doesn't respect
that. That is, when I slow the platter down, the waveform stretches the
wrong way and the BPM on the track indicator increases.

> With QT 4.7.1 (current version in Arch Linux repositories), I experience
> segfaults whenever I try to change something very quickly. Examples include
> moving a knob quickly (both through a MIDI controller and with a mouse),
> scratching (i.e. moving the waveform quickly), and anything else that modifies
> the GUI rapidly.
>
> Here's a backtrace:
> http://f.jwcxz.com/mixxx.bt
>
> It looks like the problem is with QPixmap::isNull().
>
> The second issue that I found was that after the segfault occurs, vinyl
> control is broken when I start up Mixxx again. To fix it, I need to go into
> the audio i/o preferences, change some value and change it back again (to
> enable the "Apply" button) and then click "Apply." This will allow the vinyl
> controller to work again (turning vinyl control off and back on again without
> doing this doesn't have any effect).
>
> The third issue was that the gain bars in the vinyl control setup page don't
> seem to be showing any activity (they just show the grid background).
>
> Lastly, as I understand it, scratch mode has been disabled. So, the option
> for it should be removed from the vinyl control options in the preferences.

[lp:~ywwg/mixxx/features_xwax2]

2507. By Owen Williams <email address hidden> on 2010-11-14

* fix vinyl input not working on startup (needed to set gain value)

2508. By Owen Williams <email address hidden> on 2010-11-14

* remove unused "scratch" mode

2509. By Owen Williams <email address hidden> on 2010-11-14

* respect user's choice of pitch slider direction

[Albert Santoni (gamegod)]

Hey Owen,

Thanks for fixing stuff so quickly. I just ran valgrind on your branch, and this was the result after ~30 seconds:
http://pastebin.com/MzE56Wkj

I ran valgrind for several hours on trunk earlier today and didn't see the QWidget painting warnings nor the EBSL errors.

I did see the inflateReset2 warnings in trunk though.

I was using the outlineNetbook skin during these tests. This might suggest there's a problem in WStatusLight... ? (as well as EBSL in your branch, trunk seemed fine)

Thanks!
Albert

[lp:~ywwg/mixxx/features_xwax2]

2510. By Owen Williams <email address hidden> on 2010-11-16

* initialization bug

[Owen Williams (ywwg)]

I just pushed a possible fix for this bug. There was a for-loop:

for (int i=0; i<m_iNoPos; ++i)

Which I think means that it starts at 1, not 0? I don't really know how to read valgrind so I'm not sure if that was the problem.

[JWC (jwc)]

I was still getting segfaults with revision 2510, but I think I see the problem.

When moving knobs really fast (in any skin), you eventually arrive to this backtrace:
http://f.jwcxz.com/mixxx.bt
(Updated because I was an idiot and forgot to turn off symbol stripping)

After doing some poking in wstatuslight.cpp, I found that at one point, m_iPos was 127, but m_iNoPos was only 1. Therefore, we are trying to access a bad place of memory in line 117. I'm not sure what's causing m_iPos to become 127 -- I don't know enough about the code.

However, when I changed line 113 from:
    if (m_pPixmapSLs[m_iPos])
to
    if (m_iPos < m_iNoPos && m_pPixmapSLs[m_iPos])

I couldn't reproduce the segfaults any more.

This probably isn't the "correct" fix (although I couldn't see any visible result of the change other than it not crashing), because something is likely causing m_iPos to be set incorrectly.

[lp:~ywwg/mixxx/features_xwax2]

2511. By Owen Williams <email address hidden> on 2010-11-17

* workaround improper position values getting set

2512. By Owen Williams <email address hidden> on 2010-11-17

* oops, test the right variable

[Owen Williams (ywwg)]

You rock, nice debugging. I tweaked the code so that the improper values are just thrown out completely so m_iPos doesn't get set to an invalid value.

I'll see if I can figure out why that wrong value is being set, but it might be something simple like some lights consider "127" to be on instead of "1". Perhaps that's a special case.

[JWC (jwc)]

No problem, thanks for the nice new features! I'll also continue testing and debugging whenever I get a chance. Otherwise, your branch seems to be working fine now, except for the volume gain on the vinyl control preferences panel. That might also be my window manager causing problems, so you'll probably need someone else to test that.

> You rock, nice debugging. I tweaked the code so that the improper values are
> just thrown out completely so m_iPos doesn't get set to an invalid value.
>
> I'll see if I can figure out why that wrong value is being set, but it might
> be something simple like some lights consider "127" to be on instead of "1".
> Perhaps that's a special case.

[Owen Williams (ywwg)]

Ah, I got it. The PeakIndicator used in the LateNight theme (which was crashing) is a statuslight, and that sets the value to 1, or in midi, 127. The old code set the light to off when the value was 0 and on when it was anything else.

So I changed the code so that for two-state lights, the old way applies: 0=off, nonzero=on. For multistate status lights (like mine), the values have to be exact.

This should solve the crashes (I hope).

[lp:~ywwg/mixxx/features_xwax2]

2513. By Owen Williams <email address hidden> on 2010-11-17

* fix (finally?) status light crashes and non-lighting boolean lights

[Albert Santoni (gamegod)]

Thanks Owen! I will try to run Valgrind again on your branch to confirm as
soon as I have a chance.
On 2010-11-17 1:56 PM, "Owen Williams" <email address hidden> wrote:
> Ah, I got it. The PeakIndicator used in the LateNight theme (which was
crashing) is a statuslight, and that sets the value to 1, or in midi, 127.
The old code set the light to off when the value was 0 and on when it was
anything else.
>
> So I changed the code so that for two-state lights, the old way applies:
0=off, nonzero=on. For multistate status lights (like mine), the values have
to be exact.
>
> This should solve the crashes (I hope).
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> You are reviewing the proposed merge of lp:~ywwg/mixxx/features_xwax2 into
lp:mixxx.

[JWC (jwc)]

Oops, it looks like features_xwax2, when merged with the last revision of trunk that didn't have conflicts (i.e. probably not a problem), doesn't control the second deck with the second vinyl input!

I just got my second audio card in today so that I could finally allocate one turntable to the first deck and the other to the second deck. However, both decks follow one turntable, no matter what I set the second deck's input to.

It sounds like just a simple typo or something. I'll try to look through the code to figure out what it is, but Owen probably has a better idea.

[lp:~ywwg/mixxx/features_xwax2]

2514. By Owen Williams <email address hidden> on 2010-11-19

* merge with lp:mixxx -r 2552

2515. By Owen Williams <email address hidden> on 2010-11-19

* merge with lp:mixxx -r 2557

2516. By Owen Williams <email address hidden> on 2010-11-19

* merge with lp:mixxx -r 2559

2517. By Owen Williams <email address hidden> on 2010-11-19

* don't print to cout

2518. By Owen Williams <email address hidden> on 2010-11-19

* use the control object value for samplerate instead of config value. this solves wrong samplerate bugs (because
  the config file can be out of date when using JACK)

2519. By Owen Williams <email address hidden> on 2010-11-19

* make sure vinyl input hashes are truly unique

[JWC (jwc)]

Sorry, I have another bug to report. Looks like waveform/BPM scaling features have disappeared? Possibly a conflict resolution problem?

[lp:~ywwg/mixxx/features_xwax2]

2520. By Owen Williams <email address hidden> on 2010-11-19

* confirm device samplerate matches configured samplerate (can be wrong with JACK)
  and reopen devices and vinyl controllers if there's a discrepency

2521. By Owen Williams <email address hidden> on 2010-11-20

* fix not respecting slider direction when switching to constant mode

2522. By Owen Williams <email address hidden> on 2010-11-20

* sigh, yet another stab at getting samplerates to all agree

2523. By Owen Williams <email address hidden> on 2010-11-20

* only analyze samples for the input device we were asked to analyze

2524. By Owen Williams <email address hidden> on 2010-11-22

* step 1 of fixing linear scaler

2525. By Owen Williams <email address hidden> on 2010-11-23

* step two of rewriting the scaler. sounds better maybe?

2526. By Owen Williams <email address hidden> on 2010-11-23

* audio work step three, pre-cleanup

2527. By Owen Williams <email address hidden> on 2010-11-23

* finally done(?) fixing the scaler

2528. By Owen Williams <email address hidden> on 2010-11-24

* more soul-crushing work on the scaler
* still bad clicks and pops when rapidly changing speed

2529. By Owen Williams <email address hidden> on 2010-11-24

* another scaler tweak

2530. By Owen Williams <email address hidden> on 2010-11-24

* I'll live with it. scaler work

2531. By Owen Williams <email address hidden> on 2010-11-24

* clean up (scaler)

2532. By Owen Williams <email address hidden> on 2010-11-24

* tweak ramps

2533. By Owen Williams <email address hidden> on 2010-11-27

* fixed it. really. the scaler works.

2534. By Owen Williams <email address hidden> on 2010-11-27

* fix occasional incorrect bufferings, and leave in all my debug crap (commented out)
* attempted to create multi-buffer ramp-in, failed miserably, have no idea why

2535. By Owen Williams <email address hidden> on 2010-11-27

* merge with lp:mixxx 2580

2536. By Owen Williams <email address hidden> on 2010-11-27

* undo my JACK samplerate fixes to prepare for alternative trunk fix

2537. By Owen Williams <email address hidden> on 2010-11-27

* merge lp:mixxx 2581

2538. By Owen Williams <email address hidden> on 2010-11-27

* fix end-of-track playbutton flashing

2539. By Owen Williams <email address hidden> on 2010-11-27

* fix end-of-track behavior

2540. By Owen Williams <email address hidden> on 2010-11-27

* try using two samples for rampout
* tried holding last sample, not setting to zero -- meh

2541. By Owen Williams <email address hidden> on 2010-11-28

* check for end-of-track after we resync in case we're no longer
  at end of track

2542. By Owen Williams <email address hidden> on 2010-11-28

* more tweaks to scaler because I just can't stop myself

2543. By Owen Williams <email address hidden> on 2010-11-29

* based on profiling data, flip loop in pushBuffer -- massive CPU use reduction!

2544. By Owen Williams <email address hidden> on 2010-12-05

* hrm, I thought that wouldn't happen, but no worries, it'll just loop again

[JWC (jwc)]

Aww, merge conflicts. :(

[lp:~ywwg/mixxx/features_xwax2]

2545. By Owen Williams <email address hidden> on 2010-12-08

* merge from lp:mixxx

2546. By Owen Williams <email address hidden> on 2010-12-08

* merge from lp:mixxx

[Owen Williams (ywwg)]

yeah yeah... trunk moves fast. Should be ok now.

[lp:~ywwg/mixxx/features_xwax2]

2547. By Owen Williams <email address hidden> on 2010-12-14

* merge from lp:mixxx

2548. By Owen Williams <email address hidden> on 2010-12-14

* make doubly sure that vinylcontrol is off if there's no vinyl input

2549. By Owen Williams <email address hidden> on 2010-12-15

* split the scale function into two, avoiding an awful
  hack involving dangerously reassigning the buffer member.

2550. By Owen Williams <email address hidden> on 2010-12-16

* fix bug in last revision (was double-updating a member var)

2551. By Owen Williams <email address hidden> on 2010-12-17

* try to prevent spurious needleskip detections

2552. By Owen Williams <email address hidden> on 2010-12-17

* that eliminated needleskip detection completely, revert

[JWC (jwc)]

I can't say that this is xwax2's (revision 2546) fault yet and this is going to be a really hard one to debug, but twice now, I've noticed after a few hours of mix[xx]ing, the second deck suddenly loses its vinyl control and just plays on its own. I have to go into the sound preferences and re-apply the audio devices in order to refresh things and make the vinyl control work again. I have no clue how to reproduce this problem and it's going to be difficult to find the root cause of it, but I'll spend January debugging as much as possible.

Has anyone else noticed this? Has anyone else been debugging this branch?

[lp:~ywwg/mixxx/features_xwax2]

2553. By Owen Williams <email address hidden> on 2010-12-20

* merge from lp:mixxx

2554. By Owen Williams <email address hidden> on 2010-12-31

* merge from lp:mixxx

[Albert Santoni (gamegod)]

This branch still crashes on startup while generating the timecode lookup tables on Windows, using the nightly I posted to /mess. Looks like I probably didn't fix the thread safety problem properly. (A valgrind run on Linux should immediately point out the problem though.)

[JWC (jwc)]

I found a feature-bug kind of thing.

When the needle hits the first "warning" groove (which then transitions into the set of grooves for the last minute of the vinyl), I get the following debug message:

Debug: [VinylControlXwax 1]: record end, setting constant mode

(Here's what I mean by the location:)
http://f.jwcxz.com/vinylctrl.jpg

That's a useful feature, but the problem happens after this is triggered. Vinyl control no longer works until I go to preferences, change some audio hardware setting and then change it back (so that the Apply button is enabled) and then click Apply.

I think that what should happen is that the Vinyl Control should be disabled (i.e. in Options -> Vinyl Control, it should be unchecked for that channel). Currently, it remains checked even when switching to constant mode.

Also, it would be nice if this was user-configurable. There's one more minute left in the track after that hits -- if I forget to set the needle back, another minute is usually enough to end the track.

[Owen Williams (ywwg)]

>
> Debug: [VinylControlXwax 1]: record end, setting constant mode

Your skin may be missing the new vinyl GUI elements. Vinyl control has three modes, which are togglable at any time* with midi or by the GUI: ABSolute, RELative, and CONSTant. Absolute mode follows the needle wherever it goes, relative keeps the playhead in the same place but takes the pitch from the vinyl, and constant just keeps playing at the last rate.

When the needle reaches the end of the record, the vinyl control switches to constant and there's an indicator light that should blink orange. At this point, you can move the needle back a few minutes and then change the playback mode to relative -- this way you can keep controlling the speed of playback.

But, the one bug report I would take from this is that when loading a new track, vinyl control should switch out of CONST and back to either ABS or REL... not sure how best to pick which

(* it is not possible to switch to ABS mode if you're already playing the record -- this prevents accidental sudden jumps. To get to ABS mode, stop the record and then switch the mode)

[lp:~ywwg/mixxx/features_xwax2]

2555. By Owen Williams <email address hidden> on 2011-01-05

* when coming out of record-end mode, make sure we're not in constant mode

[JWC (jwc)]

Thanks for your response, Owen. That makes sense -- I'll wait until the skin gets updated.

One fun little bug, probably the result of a bad merge or something:

Line 218 of src/library/dao/trackdao.cpp needs to be:
                  "filetype, location, comment, url, duration, rating, key, "

The rating and key columns are missing there.

[lp:~ywwg/mixxx/features_xwax2]

2556. By Owen Williams <email address hidden> on 2011-01-08

* fixed missing parameters to db call (thanks JWC)

[Owen Williams (ywwg)]

Ah, now I see the problem, my custom skin got blown away in a merge. I restored the skin.xml now, so try out Outline1024x600-netbook.

[lp:~ywwg/mixxx/features_xwax2]

2557. By Owen Williams <email address hidden> on 2011-01-08

* restore custom skin

[JWC (jwc)]

Ah, with the custom skin, I can easily see what's going on.

However, while disableRecordEndMode() now updates iVCMode at the end of a track, constant mode is still enabled. I added some debug info to disableRecordEndMode() to make it print the value of iVCMode and iOldMode before and after checking to see if we're in constant mode... The result was:

Debug: [VinylControlXwax 1]: record end, setting constant mode
Debug: [VinylControlXwax 1]: disableRecordEndMode called, iVCMode= 2 , iOldMode= 1
Debug: [VinylControlXwax 1]: Switched back, iVCMode= 1 , iOldMode= 1

So, that should mean that for the next track I load (or if I set my needle back and try moving backwards from the end of the current track), I should be in relative mode again. However, it seems to stay in constant mode! I'm guessing that iVCMode gets overwritten again after disableRecordEndMode() gets called?

[lp:~ywwg/mixxx/features_xwax2]

2558. By Owen Williams <email address hidden> on 2011-01-08

* stupid bugfix: actually set the mode when disabling record end mode

2559. By Owen Williams <email address hidden> on 2011-01-09

* merge from lp:mixxx

2560. By Owen Williams <email address hidden> on 2011-01-12

* fix turning on vinyl control would incorrectly pop out of CONST mode if it was set

2561. By Owen Williams <email address hidden> on 2011-01-15

* try a new needleskip algorithm
* record-end mode should be used even if needleskip is off

2562. By Owen Williams <email address hidden> on 2011-01-15

* make sure vinyl control gets the correct sample rate

[RAFFI TEA (raffitea)]

Great work Owen. Works great on OS X.

Some comments:

* It would be nice to add an "emergency mode". Switch to constant mode if time-code signal becomes bad.
* I like the BPM scaling but it changes too much if the platter is at 0% pitch. We should display the average BPM value over some period of time, let's say 500 ms.

[RAFFI TEA (raffitea)]

Another potential bug:

If I start in absolute mode and use loops, your code seems to switch to relative mode internally. But this is not reflected on the GUI.

I would have expected some strange behavior if loops are used in absolute mode.

[lp:~ywwg/mixxx/features_xwax2]

2563. By Owen Williams <email address hidden> on 2011-01-17

* if looping, don't allow absolute mode control

[Owen Williams (ywwg)]

@RAFFI_TEA, thanks for the notes. I've fixed the looping bug, so that should be all set now.

The "emergency mode" you describe is already pretty much implemented. Serato vinyl has two pieces of information: pitch and absolute timecode. Mixxx already knows how to deal with situations where we have pitch information but not timecode. As for situations where the pitch data is not audible, it's not really possible to distinguish between "bad signal" and "I lifted the needle." I have some little tricks, like a .1 second delay before I stop playback, and needle-skip detection, but that's about all I can do.

Under what situations are you seeing too much bpm scaling? I have a lot of code to try to make it reasonable already, and last time we talked about this we decided it takes a little getting used to but is actually pretty good.

[RAFFI TEA (raffitea)]

Hey Owen,

I am struggling a lot with dust in my attic floor -- don't ask me why :-)
As long as I have clean needles the time-code is interpreted fine. But when times goes by the signal becomes rather bad. The pitch jumps up and down.

In Mixxx's preferences, there is a possibility to check the time-code signal. But users won't have preferences opened at all times. Is it possible check the signal quality?

Or in other words, xwax but also commercial product provide a kind of time-code panel (a.k.a. scratch panel in Traktor). There a kind of "circle" if the time-code signal is good. It becomes a kind of dotted ellipse or "egg" if the signal quality decreases. But just before the time-code becomes too bad, an emergency mode (const mode) activates. (Scratch panel: http://www.bonedo.de/typo3temp/pics/4b1809c05e.jpg)

<<<< Under what situations are you seeing too much bpm scaling?
<<<< I have a lot of code to try to make it reasonable already
<<<< and last time we talked about this we decided it takes a
<<<< little gettingused to but is actually pretty good.

At standard pitch, the BPM values alternate between +- 0.4 BPM (assume 128 BPM). I don't hear any noticeable pitch movements through my headphones. I really like the feature but I think BPM values of +- 0.4 are outliers and beginners may be confused to learn beat matching (also they should learn it by ear). Therefore I think some average BPM computation is plausible. (But maybe my turntables need overhaul)

[Owen Williams (ywwg)]

> BPM values of +- 0.4

These aren't outliers, you're just seeing how much wow/flutter your turntable actually has (I'm already smoothing the values anyway).

Enough people have mentioned this issue that it's probably worth addressing. I've added QTimers in the display widgets that update the BPM displays every 1/4th second. I'd like to strike a balance between updating too fast and too slow.

[lp:~ywwg/mixxx/features_xwax2]

2564. By Owen Williams <email address hidden> on 2011-01-18

* only update bpm / rate display every 1/4 second

[RAFFI TEA (raffitea)]

Thanks, Owen. The BPM display is easier to read now :-)

[lp:~ywwg/mixxx/features_xwax2]

2565. By Owen Williams <email address hidden> on 2011-01-30

* use a better method for setting constant mode during needle skip

2566. By Owen Williams <email address hidden> on 2011-02-03

* make sure to set position no matter what the new scaler is

2567. By Owen Williams <email address hidden> on 2011-02-09

* merge from lp:mixxx

2568. By Owen Williams <email address hidden> on 2011-02-09

* merge from lp:mixxx

2569. By Owen Williams <email address hidden> on 2011-02-11

* merge from lp:mixxx

2570. By Owen Williams <email address hidden> on 2011-02-11

* make sure table is sorted on startup

2571. By Owen Williams <email address hidden> on 2011-02-17

* fix sneaky little overflow bug

2572. By Owen Williams <email address hidden> on 2011-02-17

* introduce new vinyl signal quality widget:
** ring-shaped plot thanks to xwax's built-in functionality
** color representing % of samples returning valid positions: red (0) to green (all)
** a sweep marker, showing direction of vinyl rotation (for left-right switcheroo problems)
** fancy green grid, meaning nothing at all
* note, check XXX: comment about endianness... is this a problem anywhere? (colors will be wrong)
* thanks to Albert for giving me a head-start on this

2573. By Owen Williams <email address hidden> on 2011-02-18

* redo needleskip checking *again*. I think it's pretty good now but needs testing

2574. By Owen Williams <email address hidden> on 2011-02-18

* substantial merge from lp:mixxx

2575. By Owen Williams <email address hidden> on 2011-02-18

* signal widget: if no timer, just draw the bg

2576. By Owen Williams <email address hidden> on 2011-02-18

* oops

2577. By Owen Williams <email address hidden> on 2011-02-19

* make steadypitch a little more forgiving again

2578. By Owen Williams <email address hidden> on 2011-02-19

* only show grid lines if there's a vinyl input that could be receiving a signal

2579. By Owen Williams <email address hidden> on 2011-02-20

* fix incorrect midi programming for needleskip mode

2580. By Owen Williams <email address hidden> on 2011-02-22

* merge with lp:mixxx

2581. By Owen Williams <email address hidden> on 2011-02-22

* merge from lp:mixxx

2582. By Owen Williams <email address hidden> on 2011-02-23

* remap playposition from -.14 to 1.14 for nicer midi value but still preroll (and eventual postroll)

2583. By Owen Williams <email address hidden> on 2011-02-23

* support 45RPM vinyl control
* support different vinyl types on each deck
* (note, these changes are not well-tested)

2584. By Owen Williams <email address hidden> on 2011-02-24

* fix a bug in xwax (a first!) where position wasn't adjusted for 45rpm speeds

2585. By Owen Williams <email address hidden> on 2011-02-24

* neaten up the vinyl dialog, and add an apply button which redoes the sound setup so user can see changes in the vinyl signal graphs

2586. By Owen Williams <email address hidden> on 2011-02-24

* add a special version of the vinyl configuration window that is all grayed out for people who don't have vinyl support
* TODO: create a special page on mixxx explaining the app store GPL bullshit concisely, with a big huge link to the
 download page

2587. By Owen Williams <email address hidden> on 2011-02-24

* fix crash in midiscript: check for NULL before trying to access object

2588. By Owen Williams <email address hidden> on 2011-03-03

* fix skin

2589. By Owen Williams <email address hidden> on 2011-03-03

* don't need this

2590. By Owen Williams <email address hidden> on 2011-03-04

* prevent crashes when no decks have started up

2591. By Owen Williams <email address hidden> on 2011-03-04

* NEEDS TESTING: first pass at implementing relative mode cue point selection.

2592. By Owen Williams <email address hidden> on 2011-03-04

* don't seek to inactive hotcues

2593. By Owen Williams <email address hidden> on 2011-03-08

* merge from lp:mixxx

2594. By Owen Williams <email address hidden> on 2011-03-08

* merge from lp:mixxx (blows away scratchlib among other things)

2595. By Owen Williams <email address hidden> on 2011-03-11

* EXPERIMENTAL: initial needle cueing code
* redid an if statement which caused huge changes in tabbing

2596. By Owen Williams <email address hidden> on 2011-03-11

* added yet another pushbutton, for enabling vinyl cueing mode
* make CDJ resync mode really only active with CDJs

2597. By Owen Williams <email address hidden> on 2011-03-13

* finish needle cueing mode: now has three possible settings: off, cue only to Cue point, and cue to nearest hotcue

2598. By Owen Williams <email address hidden> on 2011-03-13

* giant merge from lp:mixxx

2599. By Owen Williams <email address hidden> on 2011-03-14

* merge from lp:mixxx, hope my linear scale code still works

2600. By Owen Williams <email address hidden> on 2011-03-14

* whoops

2601. By Owen Williams <email address hidden> on 2011-03-14

* remove redundant line of extra code that wasn't needed because it was redundant

2602. By Owen Williams <email address hidden> on 2011-03-14

* fix a bunch of tabbing issues to make the eventual merge cleaner

2603. By Owen Williams <email address hidden> on 2011-03-15

* asantoni's fixes for building on windows

[Albert Santoni (gamegod)]

Hey Owen,

The only remaining thing we might want to nitpick in this branch is the changes you made to CachingReader. If CachingReader is supposed to be reading from a file, perhaps it would make more sense for the "if pre-roll then read silence" logic to be outside/before CachingReader instead.

I'm OK if we just leave a note saying maybe there's a better spot for this. I don't think RAMAN nor the scaling classes are the right place for it, so that basically leaves EngineBuffer.

[Owen Williams (ywwg)]

I'll add the comment for now. I'm not sure how I would move that code out of the reader, because enginebuffer is pretty far removed from the file itself and would have to know exactly how many samples of the buffer should be silence and how many are audio data. This number would depend on: sample rate, playback rate, and if the DJ is reversing direction (scratching the first beat). I'm afraid it would be ugly and bug-prone.

[lp:~ywwg/mixxx/features_xwax2]

2604. By Owen Williams <email address hidden> on 2011-03-18

* perhaps preroll code should be somewhere else?

2605. By Owen Williams <email address hidden> on 2011-03-18

* merge from lp:mixxx

[RAFFI TEA (raffitea)]

Hey Owen,

tested relative needle cueing. Works great. I really like it. I have never used Scratch Live but now I can imagine how it feels :-) Good work.

Please note that I have not tested the HOT CUE JUMPING!!! This will follow soon.

[RAFFI TEA (raffitea)]

Just testing the 45RPM seed. Works as expected. No problems during beat-matching.

I've seen a fix for Windows in the revision notes. Can I used your branch on Windows now? No crash during time-code (LUT) initialization?

[RAFFI TEA (raffitea)]

> Hey Owen,
>
> tested relative needle cueing. Works great. I really like it. I have never
> used Scratch Live but now I can imagine how it feels :-) Good work.
>
> Please note that I have not tested the HOT CUE JUMPING!!! This will follow
> soon.

Hot cue jump = your thirdly implemented option --> jump to the nearest hot cue --> see r2597

[Albert Santoni (gamegod)]

On Fri, Mar 18, 2011 at 1:10 PM, RAFFI TEA <email address hidden> wrote:
> Just testing the 45RPM seed. Works as expected. No problems during beat-matching.
>
> I've seen a fix for Windows in the revision notes. Can I used your branch on Windows now? No crash during time-code (LUT) initialization?

Correct, this branch works fine for me on Windows now. :)

[lp:~ywwg/mixxx/features_xwax2]

2606. By Owen Williams <email address hidden> on 2011-03-20

* merge from lp:mixxx

2607. By Owen Williams <email address hidden> on 2011-03-20

* don't use keyboard events when class methods will do (solves compiz suckage lp:738881)

2608. By Owen Williams <email address hidden> on 2011-03-20

* finish implementation of vinyl-controlled track selection
* new method: use control track to select track, then move needle back to regular area and new track will play. Selecting a new track manually will override track selection

2609. By Owen Williams <email address hidden> on 2011-03-21

* unneeded commented code

[RAFFI TEA (raffitea)]

> > BPM values of +- 0.4
>
> These aren't outliers, you're just seeing how much wow/flutter your turntable
> actually has (I'm already smoothing the values anyway).
>
> Enough people have mentioned this issue that it's probably worth addressing.
> I've added QTimers in the display widgets that update the BPM displays every
> 1/4th second. I'd like to strike a balance between updating too fast and too
> slow.

Hey Owen,

I am really thankful that BPM updates every 1/4th second. The BPM display is much better to read but it is still not perfectly to read for me. I really recommend to build the average BPM for every time interval. Traktor uses a similar approach which I think is pretty useful to find the perfect pitch position faster.

If you think it is not usefully maybe you can direct me to the code so I can implement for my own :-)

Again, thanks for your awesome work!

Tobias

[RJ Skerry-Ryan (rryan)]

Yea, I was looking at that QTimer suspiciously as I was doing the review :)

I think that instead of doing the updates in the UI (if 4 decks are going,
thats 4x250ms timers = 16Hz GUI updates even if no deck has a loaded track,
we should probably be issuing updates from within the engine. This can be
done in src/engine/bpmcontrol.cpp. They can be rate limited to a certain
window. There is already an engine update interval (e.g. how fast the
position marker on the waveform overview is updated) that we should
piggyback off of.

The added benefit here is that the a MIDI script that updates a BPM LCD on a
MIDI controller (e.g. Stanton SCS1 series) will also update at the same
interval and with the same value.

the file_bpm control is generally the detected BPM of the file and 'bpm'
control is for the engine's current dynamic rate. They are the same
currently, WNumberBpm scales the 'bpm' control by the current rate (there's
an open bug to change that too) but I think they should be changed so that
the 'bpm' control updates in intervals that are the average BPM for the
window in which the rate was calculated.

On Mon, Mar 21, 2011 at 11:03 AM, RAFFI TEA <email address hidden>wrote:

> > > BPM values of +- 0.4
> >
> > These aren't outliers, you're just seeing how much wow/flutter your
> turntable
> > actually has (I'm already smoothing the values anyway).
> >
> > Enough people have mentioned this issue that it's probably worth
> addressing.
> > I've added QTimers in the display widgets that update the BPM displays
> every
> > 1/4th second. I'd like to strike a balance between updating too fast and
> too
> > slow.
>
> Hey Owen,
>
> I am really thankful that BPM updates every 1/4th second. The BPM display
> is much better to read but it is still not perfectly to read for me. I
> really recommend to build the average BPM for every time interval. Traktor
> uses a similar approach which I think is pretty useful to find the perfect
> pitch position faster.
>
> If you think it is not usefully maybe you can direct me to the code so I
> can implement for my own :-)
>
> Again, thanks for your awesome work!
>
> Tobias
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>

[RJ Skerry-Ryan (rryan)]

(the open bug I referenced is here :
https://bugs.launchpad.net/mixxx/+bug/657890)

On Mon, Mar 21, 2011 at 11:27 AM, RJ Ryan <email address hidden> wrote:

> Yea, I was looking at that QTimer suspiciously as I was doing the review :)
>
> I think that instead of doing the updates in the UI (if 4 decks are going,
> thats 4x250ms timers = 16Hz GUI updates even if no deck has a loaded track,
> we should probably be issuing updates from within the engine. This can be
> done in src/engine/bpmcontrol.cpp. They can be rate limited to a certain
> window. There is already an engine update interval (e.g. how fast the
> position marker on the waveform overview is updated) that we should
> piggyback off of.
>
> The added benefit here is that the a MIDI script that updates a BPM LCD on
> a
> MIDI controller (e.g. Stanton SCS1 series) will also update at the same
> interval and with the same value.
>
> the file_bpm control is generally the detected BPM of the file and 'bpm'
> control is for the engine's current dynamic rate. They are the same
> currently, WNumberBpm scales the 'bpm' control by the current rate (there's
> an open bug to change that too) but I think they should be changed so that
> the 'bpm' control updates in intervals that are the average BPM for the
> window in which the rate was calculated.
>
>
> On Mon, Mar 21, 2011 at 11:03 AM, RAFFI TEA <<email address hidden>
> >wrote:
>
> > > > BPM values of +- 0.4
> > >
> > > These aren't outliers, you're just seeing how much wow/flutter your
> > turntable
> > > actually has (I'm already smoothing the values anyway).
> > >
> > > Enough people have mentioned this issue that it's probably worth
> > addressing.
> > > I've added QTimers in the display widgets that update the BPM displays
> > every
> > > 1/4th second. I'd like to strike a balance between updating too fast
> and
> > too
> > > slow.
> >
> > Hey Owen,
> >
> > I am really thankful that BPM updates every 1/4th second. The BPM display
> > is much better to read but it is still not perfectly to read for me. I
> > really recommend to build the average BPM for every time interval.
> Traktor
> > uses a similar approach which I think is pretty useful to find the
> perfect
> > pitch position faster.
> >
> > If you think it is not usefully maybe you can direct me to the code so I
> > can implement for my own :-)
> >
> > Again, thanks for your awesome work!
> >
> > Tobias
> > --
> > https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> > Your team Mixxx Development Team is subscribed to branch lp:mixxx.
> >
>
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>

[lp:~ywwg/mixxx/features_xwax2]

2610. By Owen Williams <email address hidden> on 2011-03-24

* tweaks to control track selection to make it better

2611. By Owen Williams <email address hidden> on 2011-03-24

* merge from lp:mixxx

2612. By Owen Williams <email address hidden> on 2011-03-24

* merge cleanup

2613. By Owen Williams <email address hidden> on 2011-03-25

* merge from lp:mixxx

2614. By Owen Williams <email address hidden> on 2011-03-26

* fix linear scaler pops and clicks once and for all
* disable vinyl emu in enginechannel because it hurts more than it helps

2615. By Owen Williams <email address hidden> on 2011-03-26

* comment debug statement

2616. By Owen Williams <email address hidden> on 2011-03-26

* no really, linear scaler is probably better than serato's now

2617. By Owen Williams <email address hidden> on 2011-03-28

* merge from lp:mixxx

[RAFFI TEA (raffitea)]

Tested with Traktor vinyls. Works great! Don't feel any differences compared to Serato.

I also used Serato and Traktor vinyls simultaneously on my turntables. Works as expected.

Why don't we support Traktor CDs? --Xwax limitation?

[lp:~ywwg/mixxx/features_xwax2]

2618. By Owen Williams <email address hidden> on 2011-03-29

* merge from lp:mixxx

2619. By Owen Williams <email address hidden> on 2011-03-29

* fix building on windows, or so asantoni thinks

2620. By Owen Williams <email address hidden> on 2011-03-29

* merge from lp:mixx

[JWC (jwc)]

Found a bug! I think it's the result of a problem with the merging and all the recent changes.

If you press a hotcue several times quickly while vinyl control is playing the record, the "play" button will remain in the "playing" state indefinitely (really, I tried everything to get it to shut off), meaning that you can't load a new track, so you have to restart Mixxx.

[RAFFI TEA (raffitea)]

> Found a bug! I think it's the result of a problem with the merging and all
> the recent changes.
>
> If you press a hotcue several times quickly while vinyl control is playing the
> record, the "play" button will remain in the "playing" state indefinitely
> (really, I tried everything to get it to shut off), meaning that you can't
> load a new track, so you have to restart Mixxx.

Found another minor bug. Try to set a loop and look at the play button while the loop is active. The play button goes off and on ("blinks") but the music just plays fine.

[lp:~ywwg/mixxx/features_xwax2]

2621. By Owen Williams <email address hidden> on 2011-03-30

* merge from lp:mixxx

2622. By Owen Williams <email address hidden> on 2011-03-31

* fix play button turning off while looping
* clean up some unused variables

2623. By Owen Williams <email address hidden> on 2011-03-31

* merge from lp:mixxx

2624. By Owen Williams <email address hidden> on 2011-04-01

* updated xwax safe values for traktor (thanks Tobias!)

[RJ Skerry-Ryan (rryan)]

Hey Owen,

I read over your changes and I have some comments and things that need fixing. I covered things that weren't src/vinyl* classes. I'm going to leave those to Albert. This branch is a huge amount of work so thanks so much for your dedication to making Mixxx vinyl control rock!

First off, I'm going to be picky about control naming :) It's
important because by publishing the controls, we're going to be
stuck with the names for years to come, so I'd like them to be
descriptive and uniform. Also, MIDI scripters and GUI skinners
are going to have to deal w/ them, so it's important that they
be descriptive and easy to use.

* Naming of control values should be lowercase separated by
  underscores on word boundaries (most controls are formatted
  this way). Optionally prefix it with a general identifier like
  'vinylcontrol' or 'vc' if the controls appear in a group not
  specific to the feature like [VinylControl].

* For controls in [ChannelX]
-- vinylcontrol_enabled
-- vinylcontrol_mode
-- vinylcontrol_cueing
-- vinylcontrol_vinyl_type
-- vinylcontrol_speed_type // _type so its not confused w/ a numerical value. you can also keep str if you want, but really its a type that happens to have a string associated with.

* For controls in the group [VinylControl]
-- lead_in_time
-- mode
-- needle_skip_prevention
-- gain

Hopefully this isn't a huge deal and you can just find-replace all the instances. Let me know if I'm being a huge pain in the ass.

controlpushbutton.cpp
---------------------

* In ControlPushButton::ControlPushButton(ConfigKey), m_dValue is
  set to 0 in ControlObject constructor, redundant

* I think a CPB w/ multiple states should be a "toggle" button
  with multiple states. Non-toggle should remain a momentary 0 or
  1 button. Does that screw anything up? Just move the check in
  setvalueFromMidi from the !m_bIsToggleButton block to the
  m_bIsToggleButton block. I think all you should have to do is
  setToggle(true) for the vinyl cue and mode controls in
  RateControl.

mathstuff.h
-----------

* Super-yes on adding the isnan stuff to this file. Though why is
  is the non-Windows #include of math.h commented?

mixxx.cpp
---------

* This config initialization / saving code, along with all the
  code in SoundManager, should be migrated to a
  VinylControlManager class that lives in MixxxApp. Can be done
  post-merge though.

widget/wnumberpos.cpp
widget/woverview.cpp
---------------------

* I'm pretty shaky on these changes (the range ajustments). I
  think it might help me if I explain the entire path the
  playposition control travels from CO to the widget:

* playposition is a ControlPotmeter and it has a range of -.14 to
  1.14. Let's consider the case that playposition is 0 (a track
  has just been loaded)

* When playposition is set to a value, an update for its proxies is queued.

* On a CO::sync(), this update is propagated to the proxies via
  COT::setExtern.

* All GUI widgets mapped to the skin have a
  ControlObjectThreadWidget attached to them. On an update to a
  COTW, COTW::setExtern is called. This posts a Qt event to the
  COTM (base class) with the value from
  CO::getValueToWidget(value), where val...

review: Needs Fixing

[lp:~ywwg/mixxx/features_xwax2]

2625. By Owen Williams <email address hidden> on 2011-04-04

* change ALL vinyl control object names
* requires skin and config file updates

2626. By Owen Williams <email address hidden> on 2011-04-04

* typo in control object name

2627. By Owen Williams <email address hidden> on 2011-04-04

* make multistate pushbottons toggling

2628. By Owen Williams <email address hidden> on 2011-04-04

* revert numberrate, don't do throttling here

2629. By Owen Williams <email address hidden> on 2011-04-05

* fix typo

2630. By Owen Williams <email address hidden> on 2011-04-05

* get rid of special buffers for scratching, just use the buffer we have

2631. By Owen Williams <email address hidden> on 2011-04-05

* little tiny code-neatening

2632. By Owen Williams <email address hidden> on 2011-04-06

* fix some memory leaks in status light code

2633. By Owen Williams <email address hidden> on 2011-04-06

* merge from lp:mixxx

[JWC (jwc)]

*sigh* This is an interesting one.

Start playing a track at any tempo. Then, spin the vinyl back and release it to let it play. For about a quarter of a second, it'll play correctly at the original tempo, and then right afterwards, the pitch will dip very heavily (>10%) and return back to normal about 50% later.

You can also achieve this effect by scratching back and forth, but the _speed_ at which you scratch actually makes a difference. For example, if you scratch back and forth at roughly 33rpm, the pitch dip won't exist! If you scratch slowly though, the amount that the pitch dips seems to be proportional to the speed at which you scroll.

Again, the weird thing is that the record starts playing normally for about a quarter of a second and _then_ the pitch dips and returns back to normal.

Yes, I verified that this is not in fact my turntables.

[RAFFI TEA (raffitea)]

JWC,

sounds like we have similar problems, but the only difference is, that I experience the problem with Traktor Scratch, too. Whenever I release the vinyl on my (crappy?) "Reloop RR 4000 m3d" the BPM value increases up to 5% and more. After a few seconds the BPM values narrows down to the base value. This is the reason why I always use "key lock" to prevent changes in the pitch.

Please note that I used clean needles and Serato/Traktor records for the test.

I guess that my turntables are crappy. Would be interested how a Tecnics behave... because the behavior of my turntables is not normal. All professional DJs I know don't have such problems.

[JWC (jwc)]

I forgot to mention that I am using CV02 vinyls that are pretty clean and two needles that are fine. My turntables aren't great: Stanton STR8-60 and T.80. But looking at the samples on return from the backspin or whatever, they look okay. I'm thinking it's an error in the algorithm. Somehow, information recovery doesn't seem work quite correctly. Specifically, I'm extremely interested in figuring out why after a backspin, the sound returns normally for a quarter of a second before the dip in pitch.

I'll record some examples in a few hours for the purposes of demonstration.

[JWC (jwc)]

Possible reason (haven't tested to confirm yet):

Last night I was playing with my main sound card as output and my usb sound card as input. Normally, I use my USB card as both input and output. For my laptop, though, the USB bus doesn't seem to have enough bandwidth to do this.

So, radiomark told me on IRC that the samples weren't syncing up because of clock differences:

> radiomark | If you imagine, it has to synchronise playback (which runs
> | from the soundcard's outbound clock) with the relative and
> | absolute vinyl data (which runs on the clock of the spinnin
> | vinyl)

I'm investigating this a bit. Maybe you already implemented it and it's something else... I'll take a look.

[lp:~ywwg/mixxx/features_xwax2]

2634. By Owen Williams <email address hidden> on 2011-04-08

* merge from lp:mixxx

[RJ Skerry-Ryan (rryan)]

OK looks like all my complaints are now fixed :) (minus VinylControlControl in EngineBuffer -- I'll remove that myself post merge) it's now up to albert to OK the vinylcontrol* classes and then we can merge this sucker.

Just to get it in writing somewhere, ywwg and I talked about how I asked him to use WDisplay instead of WStatusLight, but it turns out WDisplay is geared towards being a knob but with no input. The control connected to it is scaled to 0.0 through 128.0 based on its range. This isn't suitable for indicator controls that represent fixed status values.

After Owen's changes, WStatusLight will be to WPushButton what WDisplay is to WKnob.

review: Approve

[lp:~ywwg/mixxx/features_xwax2]

2635. By Owen Williams <email address hidden> on 2011-04-11

* merge from lp:mixxx

[Albert Santoni (gamegod)]

I also approve. The vinyl control logic is fairly straightforward, it
just needs loads of testing now to make sure it's tight. Some final
comments:
- I would squash those qDebugs in vinylcontrolxwax.cpp before the release.
- Maybe factor some of those constants out too.
- We should make sure a tester verifies that vinyl control still works
with a 96000 Hz samplerate.

Otherwise, great stuff! Launchpad's code review interface is broken
right now so I can't approve it properly, but RJ, feel free to merge
into trunk whenever.

Thanks Owen!
Albert

On Fri, Apr 8, 2011 at 11:21 PM, RJ Ryan <email address hidden> wrote:
> Review: Approve
> OK looks like all my complaints are now fixed :) (minus VinylControlControl in EngineBuffer -- I'll remove that myself post merge) it's now up to albert to OK the vinylcontrol* classes and then we can merge this sucker.
>
> Just to get it in writing somewhere, ywwg and I talked about how I asked him to use WDisplay instead of WStatusLight, but it turns out WDisplay is geared towards being a knob but with no input. The control connected to it is scaled to 0.0 through 128.0 based on its range. This isn't suitable for indicator controls that represent fixed status values.
>
> After Owen's changes, WStatusLight will be to WPushButton what WDisplay is to WKnob.
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/37798
> You are reviewing the proposed merge of lp:~ywwg/mixxx/features_xwax2 into lp:mixxx.
>

[lp:~ywwg/mixxx/features_xwax2]

2636. By Owen Williams <email address hidden> on 2011-04-14

* merge from lp:mixxx

2637. By Owen Williams <email address hidden> on 2011-04-15

* merge bill's trunk merge fixes from lp:~mixxxdevelopers/mixxx/features_xwax2_bill

2638. By Owen Williams <email address hidden> on 2011-04-15

* merge from lp:mixxx

[William Good (bkgood)]

Can we hold off on merging this for a bit longer? I'm working though getting the code to conform (at least mostly) with style guidelines, mostly tabs to spaces and deleting characters matching \b+$ (so whitespace at end of lines), but perhaps more importantly some unbraced if's (which can create real confusion later).

review: Disapprove

[lp:~ywwg/mixxx/features_xwax2]

2639. By Owen Williams <email address hidden> on 2011-04-16

* merge from lp:~mixxxdevelopers/mixxx/features_xwax2_bill

2640. By Owen Williams <email address hidden> on 2011-04-16

* merge from lp:~mixxxdevelopers/mixxx/features_xwax2_bill (cleanup)

[William Good (bkgood)]

heh, I lost it too :) It looks like you got all my changes, so I'm happy. Merge away!

review: Approve

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-04-13 02:58:05 +0000
+++ mixxx/build/depends.py	2011-04-16 23:24:33 +0000
@@ -336,6 +336,7 @@
                    "dlgprefcontrols.cpp",
                    "dlgprefbpm.cpp",
                    "dlgprefreplaygain.cpp",
+                   "dlgprefnovinyl.cpp",
                    "dlgbpmscheme.cpp",
                    "dlgabout.cpp",
                    "dlgprefeq.cpp",
@@ -581,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')

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2011-04-04 05:46:49 +0000
+++ mixxx/build/features.py	2011-04-16 23:24:33 +0000
@@ -293,9 +293,12 @@
                    'dlgprefvinyl.cpp',
                    'vinylcontrolsignalwidget.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):

=== 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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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	2011-04-08 06:04:27 +0000
+++ mixxx/lib/xwax/timecoder.c	2011-04-16 23:24:33 +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, const 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	2011-04-08 06:04:27 +0000
+++ mixxx/lib/xwax/timecoder.h	2011-04-16 23:24:33 +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, const 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-16 23:24:33 +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;
-}

=== 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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +0000 differ
=== modified file 'mixxx/src/cachingreader.cpp'
--- mixxx/src/cachingreader.cpp	2010-10-23 08:41:23 +0000
+++ mixxx/src/cachingreader.cpp	2011-04-16 23:24:33 +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);

=== modified file 'mixxx/src/controlobject.cpp'
--- mixxx/src/controlobject.cpp	2011-04-04 05:36:08 +0000
+++ mixxx/src/controlobject.cpp	2011-04-16 23:24:33 +0000
@@ -293,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/controlpushbutton.cpp'
--- mixxx/src/controlpushbutton.cpp	2010-09-17 02:20:29 +0000
+++ mixxx/src/controlpushbutton.cpp	2011-04-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2011-03-17 06:49:23 +0000
+++ mixxx/src/dlgpreferences.cpp	2011-04-16 23:24:33 +0000
@@ -18,6 +18,8 @@
 
 #ifdef __VINYLCONTROL__
 #include "dlgprefvinyl.h"
+#else
+#include "dlgprefnovinyl.h"
 #endif
 
 #ifdef __SHOUTCAST__
@@ -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
@@ -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	2011-03-17 06:49:23 +0000
+++ mixxx/src/dlgpreferences.h	2011-04-16 23:24:33 +0000
@@ -42,6 +42,7 @@
 class DlgPrefRecord;
 class DlgPrefBpm;
 class DlgPrefVinyl;
+class DlgPrefNoVinyl;
 class DlgPrefShoutcast;
 class DlgPrefReplayGain;
 class PowerMate;
@@ -89,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-16 23:24:33 +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-16 23:24:33 +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-16 23:24:33 +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/dlgprefsound.cpp'
--- mixxx/src/dlgprefsound.cpp	2011-04-08 06:04:27 +0000
+++ mixxx/src/dlgprefsound.cpp	2011-04-16 23:24:33 +0000
@@ -120,8 +120,11 @@
 #ifdef __VINYLCONTROL__
     // Scratchlib sucks, throw rocks at it
     // XXX(bkgood) HACKS DELETE THIS WHEN SCRATCHLIB GETS NUKED KTHX
-    if (m_pConfig->getValueString(ConfigKey("[VinylControl]", "strVinylType"))
-            == MIXXX_VINYL_FINALSCRATCH &&
+    if ((m_pConfig->getValueString(ConfigKey("[Channel1]", "vinylcontrol_vinyl_type"))
+            == MIXXX_VINYL_FINALSCRATCH  ||
+            m_pConfig->getValueString(ConfigKey("[Channel2]", "vinylcontrol_vinyl_type"))
+            == MIXXX_VINYL_FINALSCRATCH)
+            &&
         sampleRateComboBox->itemData(sampleRateComboBox->currentIndex()).toUInt()
             != 44100) {
         QMessageBox::warning(this, tr("Mixxx Error"),

=== modified file 'mixxx/src/dlgprefvinyl.cpp'
--- mixxx/src/dlgprefvinyl.cpp	2011-03-30 06:00:45 +0000
+++ mixxx/src/dlgprefvinyl.cpp	2011-04-16 23:24:33 +0000
@@ -31,7 +31,7 @@
 
 DlgPrefVinyl::DlgPrefVinyl(QWidget * parent, SoundManager * soundman,
                            ConfigObject<ConfigValue> * _config) : QWidget(parent), Ui::DlgPrefVinylDlg(),
-    m_COTMode(ControlObject::getControl(ConfigKey("[VinylControl]", "Mode")))
+    m_COTMode(ControlObject::getControl(ConfigKey("[VinylControl]", "mode")))
 {
     m_pSoundManager = soundman;
     config = _config;
@@ -43,29 +43,9 @@
     QButtonGroup vinylControlMode;
     vinylControlMode.addButton(AbsoluteMode);
     vinylControlMode.addButton(RelativeMode);
-    vinylControlMode.addButton(ScratchMode);
-
-    //Get access to the timecode strength ControlObjects
-    m_timecodeQuality1 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlQuality")));
-    m_timecodeQuality2 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlQuality")));
-
-    m_vinylControlInput1L = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlInputL")));
-    m_vinylControlInput1R = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlInputR")));
-    m_vinylControlInput2L = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlInputL")));
-    m_vinylControlInput2R = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlInputR")));
-
-
-
-    m_signalWidget1.setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-    m_signalWidget2.setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-    const unsigned signalWidgetWidth = 75;
-    const unsigned signalWidgetHeight = 75;
-    m_signalWidget1.setMinimumSize(signalWidgetWidth, signalWidgetHeight);
-    m_signalWidget2.setMinimumSize(signalWidgetWidth, signalWidgetHeight);
-    m_signalWidget1.setMaximumSize(signalWidgetWidth, signalWidgetHeight);
-    m_signalWidget2.setMaximumSize(signalWidgetWidth, signalWidgetHeight);
-    m_signalWidget1.setupWidget();
-    m_signalWidget2.setupWidget();
+
+    m_signalWidget1.setSize(MIXXX_VINYL_SCOPE_SIZE);
+    m_signalWidget2.setSize(MIXXX_VINYL_SCOPE_SIZE);
 
     delete groupBoxSignalQuality->layout();
     QHBoxLayout *layout = new QHBoxLayout;
@@ -74,22 +54,38 @@
     groupBoxSignalQuality->setLayout(layout);
 
     // Add vinyl types
-    ComboBoxVinylType->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEA);
-    ComboBoxVinylType->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEB);
-    ComboBoxVinylType->addItem(MIXXX_VINYL_SERATOCD);
-    ComboBoxVinylType->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEA);
-    ComboBoxVinylType->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEB);
-
+    ComboBoxVinylType1->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEA);
+    ComboBoxVinylType1->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEB);
+    ComboBoxVinylType1->addItem(MIXXX_VINYL_SERATOCD);
+    ComboBoxVinylType1->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEA);
+    ComboBoxVinylType1->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEB);
+
+    ComboBoxVinylType2->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEA);
+    ComboBoxVinylType2->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEB);
+    ComboBoxVinylType2->addItem(MIXXX_VINYL_SERATOCD);
+    ComboBoxVinylType2->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEA);
+    ComboBoxVinylType2->addItem(MIXXX_VINYL_TRAKTORSCRATCHSIDEB);
+
+    ComboBoxVinylSpeed1->addItem(MIXXX_VINYL_SPEED_33);
+    ComboBoxVinylSpeed1->addItem(MIXXX_VINYL_SPEED_45);
+
+    ComboBoxVinylSpeed2->addItem(MIXXX_VINYL_SPEED_33);
+    ComboBoxVinylSpeed2->addItem(MIXXX_VINYL_SPEED_45);
+
+    connect(applyButton, SIGNAL(clicked()), this, SLOT(slotApply()));
     connect(VinylGain, SIGNAL(sliderReleased()), this, SLOT(VinylGainSlotApply()));
     //connect(ComboBoxDeviceDeck1, SIGNAL(currentIndexChanged()), this, SLOT(()));
 
     connect(VinylGain, SIGNAL(sliderReleased()), this, SLOT(settingsChanged()));
-    connect(ComboBoxVinylType, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
+    connect(ComboBoxVinylType1, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
+    connect(ComboBoxVinylType2, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
+    connect(ComboBoxVinylSpeed1, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
+    connect(ComboBoxVinylSpeed2, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
     connect(LeadinTime, SIGNAL(textChanged(const QString&)), this, SLOT(settingsChanged()));
     connect(NeedleSkipEnable, SIGNAL(stateChanged(int)), this, SLOT(settingsChanged()));
     connect(AbsoluteMode, SIGNAL(toggled(bool)), this, SLOT(settingsChanged()));
     connect(RelativeMode, SIGNAL(toggled(bool)), this, SLOT(settingsChanged()));
-    connect(ScratchMode, SIGNAL(toggled(bool)), this, SLOT(settingsChanged()));
+    connect(m_pSoundManager, SIGNAL(devicesSetup()), this, SLOT(settingsChanged()));
 }
 
 DlgPrefVinyl::~DlgPrefVinyl()
@@ -99,14 +95,11 @@
 /** @brief Performs any necessary actions that need to happen when the prefs dialog is opened */
 void DlgPrefVinyl::slotShow()
 {
-    //Connect the signal quality ControlObjects to this dialog, so they start updating
-    connect(m_timecodeQuality1, SIGNAL(valueChanged(double)), this, SLOT(updateSignalQuality1(double)));
-    connect(m_timecodeQuality2, SIGNAL(valueChanged(double)), this, SLOT(updateSignalQuality2(double)));
-
-    connect(m_vinylControlInput1L, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelLeft1(double)));
-    connect(m_vinylControlInput1R, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelRight1(double)));
-    connect(m_vinylControlInput2L, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelLeft2(double)));
-    connect(m_vinylControlInput2R, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelRight2(double)));
+    QList<VinylControlProxy*> VCProxiesList = m_pSoundManager->getVinylControlProxies();
+    if (VCProxiesList.value(0) != NULL)
+        m_signalWidget1.setVinylControlProxy(VCProxiesList.value(0));
+    if (VCProxiesList.value(1) != NULL)
+        m_signalWidget2.setVinylControlProxy(VCProxiesList.value(1));
 
     //(Re)Initialize the signal quality indicators
     m_signalWidget1.resetWidget();
@@ -122,12 +115,6 @@
     //Stop updating the vinyl control signal indicators when the prefs dialog is closed.
     m_signalWidget1.stopDrawing();
     m_signalWidget2.stopDrawing();
-    m_timecodeQuality1->disconnect(this);
-    m_timecodeQuality2->disconnect(this);
-    m_vinylControlInput1L->disconnect(this);
-    m_vinylControlInput1R->disconnect(this);
-    m_vinylControlInput2L->disconnect(this);
-    m_vinylControlInput2R->disconnect(this);
 }
 
 void DlgPrefVinyl::slotUpdate()
@@ -135,33 +122,44 @@
     m_dontForce = true; // otherwise all the signals fired in here will cause
                         // DlgPrefSound to call setupDevices needlessly :) -- bkgood
     // Set vinyl control types in the comboboxes
-    int combo_index = ComboBoxVinylType->findText(config->getValueString(ConfigKey("[VinylControl]","strVinylType")));
-    if (combo_index != -1)
-        ComboBoxVinylType->setCurrentIndex(combo_index);
+    int combo_index = ComboBoxVinylType1->findText(config->getValueString(ConfigKey("[Channel1]","vinylcontrol_vinyl_type")));
+    if (combo_index != -1)
+        ComboBoxVinylType1->setCurrentIndex(combo_index);
+
+    combo_index = ComboBoxVinylType2->findText(config->getValueString(ConfigKey("[Channel2]","vinylcontrol_vinyl_type")));
+    if (combo_index != -1)
+        ComboBoxVinylType2->setCurrentIndex(combo_index);
+
+    combo_index = ComboBoxVinylSpeed1->findText(config->getValueString(ConfigKey("[Channel1]","vinylcontrol_speed_type")));
+    if (combo_index != -1)
+        ComboBoxVinylSpeed1->setCurrentIndex(combo_index);
+
+    combo_index = ComboBoxVinylSpeed2->findText(config->getValueString(ConfigKey("[Channel2]","vinylcontrol_speed_type")));
+    if (combo_index != -1)
+        ComboBoxVinylSpeed2->setCurrentIndex(combo_index);
 
     // set lead-in time
-    LeadinTime->setText (config->getValueString(ConfigKey("[VinylControl]","LeadInTime")) );
+    LeadinTime->setText (config->getValueString(ConfigKey("[VinylControl]","lead_in_time")) );
 
     // set Relative mode
-    int iMode = config->getValueString(ConfigKey("[VinylControl]","Mode")).toInt();
+    int iMode = config->getValueString(ConfigKey("[VinylControl]","mode")).toInt();
     if (iMode == MIXXX_VCMODE_ABSOLUTE)
         AbsoluteMode->setChecked(true);
     else if (iMode == MIXXX_VCMODE_RELATIVE)
         RelativeMode->setChecked(true);
-    else if (iMode == MIXXX_VCMODE_SCRATCH)
-        ScratchMode->setChecked(true);
 
     // Honour the Needle Skip Prevention setting.
-    NeedleSkipEnable->setChecked( (bool)config->getValueString( ConfigKey("[VinylControl]", "NeedleSkipPrevention") ).toInt() );
+    NeedleSkipEnable->setChecked( (bool)config->getValueString( ConfigKey("[VinylControl]", "needle_skip_prevention") ).toInt() );
 
     //set vinyl control gain
-    VinylGain->setValue( config->getValueString(ConfigKey("[VinylControl]","VinylControlGain")).toInt());
+    VinylGain->setValue( config->getValueString(ConfigKey("[VinylControl]","gain")).toInt());
     m_dontForce = false;
 }
 
 // Update the config object with parameters from dialog
 void DlgPrefVinyl::slotApply()
 {
+    QString device2;
     qDebug() << "DlgPrefVinyl::Apply";
 
     // Lead-in time
@@ -169,9 +167,9 @@
     bool isInteger;
     strLeadIn.toInt(&isInteger);
     if (isInteger)
-        config->set(ConfigKey("[VinylControl]","LeadInTime"), strLeadIn);
+        config->set(ConfigKey("[VinylControl]","lead_in_time"), strLeadIn);
     else
-        config->set(ConfigKey("[VinylControl]","LeadInTime"), MIXXX_VC_DEFAULT_LEADINTIME);
+        config->set(ConfigKey("[VinylControl]","lead_in_time"), MIXXX_VC_DEFAULT_LEADINTIME);
 
     //Apply updates for everything else...
     VinylTypeSlotApply();
@@ -182,12 +180,12 @@
         iMode = MIXXX_VCMODE_ABSOLUTE;
     if (RelativeMode->isChecked())
         iMode = MIXXX_VCMODE_RELATIVE;
-    if (ScratchMode->isChecked())
-        iMode = MIXXX_VCMODE_SCRATCH;
 
+    ControlObject::getControl(ConfigKey("[Channel1]", "vinylcontrol_mode"))->set(iMode);
+    ControlObject::getControl(ConfigKey("[Channel2]", "vinylcontrol_mode"))->set(iMode);
     m_COTMode.slotSet(iMode);
-    config->set(ConfigKey("[VinylControl]","Mode"), ConfigValue(iMode));
-    config->set(ConfigKey("[VinylControl]","NeedleSkipPrevention" ), ConfigValue( (int)(NeedleSkipEnable->isChecked( )) ) );
+    config->set(ConfigKey("[VinylControl]","mode"), ConfigValue(iMode));
+    config->set(ConfigKey("[VinylControl]","needle_skip_prevention" ), ConfigValue( (int)(NeedleSkipEnable->isChecked( )) ) );
 
     slotUpdate();
 }
@@ -197,80 +195,39 @@
 
 }
 
-void DlgPrefVinyl::EnableScratchModeSlotApply()
-{
-
-}
-
 void DlgPrefVinyl::VinylTypeSlotApply()
 {
-    config->set(ConfigKey("[VinylControl]","strVinylType"), ConfigValue(ComboBoxVinylType->currentText()));
+    config->set(ConfigKey("[Channel1]","vinylcontrol_vinyl_type"), ConfigValue(ComboBoxVinylType1->currentText()));
+    config->set(ConfigKey("[Channel2]","vinylcontrol_vinyl_type"), ConfigValue(ComboBoxVinylType2->currentText()));
+    config->set(ConfigKey("[Channel1]","vinylcontrol_speed_type"), ConfigValue(ComboBoxVinylSpeed1->currentText()));
+    config->set(ConfigKey("[Channel2]","vinylcontrol_speed_type"), ConfigValue(ComboBoxVinylSpeed2->currentText()));
+    emit(applySound());
 }
 
 void DlgPrefVinyl::VinylGainSlotApply()
 {
     qDebug() << "in VinylGainSlotApply()" << "with gain:" << VinylGain->value();
     //Update the config key...
-    config->set(ConfigKey("[VinylControl]","VinylControlGain"), ConfigValue(VinylGain->value()));
+    config->set(ConfigKey("[VinylControl]","gain"), ConfigValue(VinylGain->value()));
 
     //Update the ControlObject...
-    ControlObject* pControlObjectVinylControlGain = ControlObject::getControl(ConfigKey("[VinylControl]", "VinylControlGain"));
+    ControlObject* pControlObjectVinylControlGain = ControlObject::getControl(ConfigKey("[VinylControl]", "gain"));
     pControlObjectVinylControlGain->set(VinylGain->value());
-
-    //qDebug() << "Setting Gain Text";
-    //gain->setText(config->getValueString(ConfigKey("[VinylControl]","VinylControlGain")));        //this is probably ineffecient...
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new signal quality level for channel 1 (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateSignalQuality1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGQUALITY, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new signal quality level for channel 2 (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateSignalQuality2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGQUALITY, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the left channel of the first deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelLeft1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the right channel of the first deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelRight1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the left channel of the second deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelLeft2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the right channel of the second deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelRight2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, value);
 }
 
 void DlgPrefVinyl::settingsChanged() {
     if (!m_dontForce) {
         emit(refreshVCProxies());
     }
+
+    QList<VinylControlProxy*> VCProxiesList = m_pSoundManager->getVinylControlProxies();
+    if (VCProxiesList.value(0) != NULL) {
+        m_signalWidget1.setVinylControlProxy(VCProxiesList.value(0));
+    }
+    if (VCProxiesList.value(1) != NULL) {
+        m_signalWidget2.setVinylControlProxy(VCProxiesList.value(1));
+    }
+
+    m_signalWidget1.setVinylActive(m_pSoundManager->hasVinylInput(0));
+    m_signalWidget2.setVinylActive(m_pSoundManager->hasVinylInput(1));
 }

=== modified file 'mixxx/src/dlgprefvinyl.h'
--- mixxx/src/dlgprefvinyl.h	2011-03-30 06:00:45 +0000
+++ mixxx/src/dlgprefvinyl.h	2011-04-16 23:24:33 +0000
@@ -44,22 +44,16 @@
     /** Update widget */
     void slotUpdate();
     void slotApply();
-	void EnableRelativeModeSlotApply();
-	void EnableScratchModeSlotApply();
-	void VinylTypeSlotApply();
+    void EnableRelativeModeSlotApply();
+    void VinylTypeSlotApply();
     void VinylGainSlotApply();
-    void updateSignalQuality1(double value);
-    void updateSignalQuality2(double value);
-    void updateInputLevelLeft1(double value);
-    void updateInputLevelRight1(double value);
-    void updateInputLevelLeft2(double value);
-    void updateInputLevelRight2(double value);
     void slotClose();
     void slotShow();
 
 signals:
     void apply();
     void refreshVCProxies();
+    void applySound();
 private slots:
     void settingsChanged();
 private:

=== modified file 'mixxx/src/dlgprefvinyldlg.ui'
--- mixxx/src/dlgprefvinyldlg.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/dlgprefvinyldlg.ui	2011-04-16 23:24:33 +0000
@@ -14,7 +14,7 @@
    <string>Form1</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Input</string>
@@ -128,21 +128,16 @@
        </layout>
       </item>
      </layout>
-     <zorder>devicesLabel</zorder>
-     <zorder>label_2</zorder>
-     <zorder>horizontalLayoutWidget</zorder>
-     <zorder>textLabel1_3</zorder>
-     <zorder>horizontalLayoutWidget_2</zorder>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Vinyl Configuration</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel2">
+       <widget class="QLabel" name="TextLabel29">
         <property name="enabled">
          <bool>true</bool>
         </property>
@@ -156,15 +151,31 @@
          <font/>
         </property>
         <property name="text">
-         <string>Vinyl Type</string>
+         <string>Deck 1 Vinyl Type</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" colspan="2">
-       <widget class="QComboBox" name="ComboBoxVinylType">
+      <item row="0" column="2">
+       <widget class="QComboBox" name="ComboBoxVinylType1">
+        <property name="enabled">
+         <bool>true</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>true</bool>
         </property>
@@ -180,6 +191,60 @@
        </widget>
       </item>
       <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel28">
+        <property name="enabled">
+         <bool>true</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>true</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>true</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>true</bool>
@@ -201,7 +266,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
+      <item row="2" column="2">
        <widget class="QLineEdit" name="LeadinTime">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -211,7 +276,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
+      <item row="2" column="3">
        <widget class="QLabel" name="TextLabel2_2_2">
         <property name="enabled">
          <bool>true</bool>
@@ -227,7 +292,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="3" column="1">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -243,17 +308,26 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" rowspan="2">
+   <item row="2" column="0" rowspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <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">
@@ -270,27 +344,36 @@
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="ScratchMode">
-        <property name="text">
-         <string>Scratch 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">
+   <item row="2" column="1" colspan="2">
     <widget class="QGroupBox" name="groupBoxSignalQuality">
      <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">
@@ -308,7 +391,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="3" column="1" colspan="2">
     <widget class="QLabel" name="label">
      <property name="enabled">
       <bool>false</bool>
@@ -324,15 +407,34 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="4" column="2">
+    <widget class="QPushButton" name="applyButton">
+     <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>51</width>
-       <height>59</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
     </spacer>

=== modified file 'mixxx/src/engine/bpmcontrol.cpp'
--- mixxx/src/engine/bpmcontrol.cpp	2011-04-03 20:51:04 +0000
+++ mixxx/src/engine/bpmcontrol.cpp	2011-04-16 23:24:33 +0000
@@ -78,7 +78,7 @@
 }
 
 void BpmControl::slotFileBpmChanged(double bpm) {
-    qDebug() << this << "slotFileBpmChanged" << bpm;
+    //qDebug() << this << "slotFileBpmChanged" << bpm;
     // Adjust the file-bpm with the current setting of the rate to get the
     // engine BPM.
     double dRate = 1.0 + m_pRateDir->get() * m_pRateRange->get() * m_pRateSlider->get();

=== modified file 'mixxx/src/engine/enginebuffer.cpp'
--- mixxx/src/engine/enginebuffer.cpp	2011-04-07 05:08:22 +0000
+++ mixxx/src/engine/enginebuffer.cpp	2011-04-16 23:24:33 +0000
@@ -39,6 +39,11 @@
 #include "engine/quantizecontrol.h"
 
 
+#ifdef __VINYLCONTROL__
+#include "vinylcontrol.h"
+#include "library/dao/cue.h"
+#endif
+
 #include "trackinfoobject.h"
 
 #ifdef _MSC_VER
@@ -72,8 +77,11 @@
     m_pScaleLinear(NULL),
     m_pScaleST(NULL),
     m_bScalerChanged(false),
-    m_fLastSampleValue(0.),
-    m_bLastBufferPaused(true) {
+    m_bLastBufferPaused(true),
+    m_fRampValue(0.0) {
+
+    m_fLastSampleValue[0] = 0;
+    m_fLastSampleValue[1] = 0;
 
     m_pReader = new CachingReader(_group, _config);
     connect(m_pReader, SIGNAL(trackLoaded(TrackPointer, int, int)),
@@ -83,7 +91,6 @@
             this, SLOT(slotTrackLoadFailed(TrackPointer, QString)),
             Qt::DirectConnection);
 
-
     // Play button
     playButton = new ControlPushButton(ConfigKey(group, "play"));
     playButton->setToggleButton(true);
@@ -126,14 +133,15 @@
     rateEngine = new ControlObject(ConfigKey(group, "rateEngine"));
 
     // Slider to show and change song position
-    playposSlider = new ControlPotmeter(ConfigKey(group, "playposition"), 0., 1.);
+    //these bizarre choices map conveniently to the 0-127 range of midi
+    playposSlider = new ControlPotmeter(ConfigKey(group, "playposition"), -0.14, 1.14);
     connect(playposSlider, SIGNAL(valueChanged(double)),
             this, SLOT(slotControlSeek(double)),
             Qt::DirectConnection);
 
     // Control used to communicate ratio playpos to GUI thread
     visualPlaypos =
-        new ControlPotmeter(ConfigKey(group, "visual_playposition"), 0., 1.);
+        new ControlPotmeter(ConfigKey(group, "visual_playposition"), -0.14, 1.14);
 
     // m_pTrackEnd is used to signal when at end of file during
     // playback. TODO(XXX) This should not even be a control object because it
@@ -145,6 +153,14 @@
     m_pRepeat = new ControlPushButton(ConfigKey(group, "repeat"));
     m_pRepeat->setToggleButton(true);
 
+#ifdef __VINYLCONTROL__
+    m_pVinylStatus = new ControlObject(ConfigKey(group,"vinylcontrol_status"));
+    m_pVinylSeek = new ControlObject(ConfigKey(group,"vinylcontrol_seek"));
+    connect(m_pVinylSeek, SIGNAL(valueChanged(double)),
+            this, SLOT(slotControlVinylSeek(double)),
+            Qt::DirectConnection);
+#endif
+
     // Sample rate
     m_pSampleRate = ControlObject::getControl(ConfigKey("[Master]","samplerate"));
 
@@ -192,10 +208,17 @@
             this, SLOT(slotEjectTrack(double)),
             Qt::DirectConnection);
 
+    //m_iRampIter = 0;
+
+    /*df.setFileName("mixxx-debug.csv");
+    df.open(QIODevice::WriteOnly | QIODevice::Text);
+    writer.setDevice(&df);*/
 }
 
 EngineBuffer::~EngineBuffer()
 {
+    //close the writer
+    /*df.close();*/
     delete m_pReadAheadManager;
     delete m_pReader;
 
@@ -353,21 +376,85 @@
     emit(trackUnloaded(pTrack));
 }
 
+void EngineBuffer::slotControlVinylSeek(double change)
+{
+#ifdef __VINYLCONTROL__
+    if(isnan(change) || change > 1.14 || change < -1.14) {
+        // This seek is ridiculous.
+        return;
+    }
+
+    double new_playpos = round(change*file_length_old);
+
+    ControlObject *pVinylMode = ControlObject::getControl(ConfigKey(group,"vinylcontrol_mode"));
+    ControlObject *pVinylEnabled = ControlObject::getControl(ConfigKey(group,"vinylcontrol_enabled"));
+
+    if (m_pCurrentTrack != NULL && pVinylEnabled != NULL && pVinylMode != NULL) {
+        if (pVinylEnabled->get() && pVinylMode->get() == MIXXX_VCMODE_RELATIVE) {
+            int cuemode = (int)ControlObject::getControl(ConfigKey(group,"vinylcontrol_cueing"))->get();
+
+            //if in preroll, always seek
+            if (new_playpos < 0) {
+                slotControlSeek(change);
+                return;
+            } else if (cuemode == MIXXX_RELATIVE_CUE_OFF) {
+                return;  //if off, do nothing
+            } else if (cuemode == MIXXX_RELATIVE_CUE_ONECUE) {
+                //if onecue, just seek to the regular cue
+                slotControlSeekAbs(m_pCurrentTrack->getCuePoint());
+                return;
+            }
+
+            double distance = 0;
+            int nearest_playpos = -1;
+
+            QList<Cue*> cuePoints = m_pCurrentTrack->getCuePoints();
+            QListIterator<Cue*> it(cuePoints);
+            while (it.hasNext()) {
+                Cue* pCue = it.next();
+                if (pCue->getType() != Cue::CUE || pCue->getHotCue() == -1)
+                    continue;
+
+                int cue_position = pCue->getPosition();
+                //pick cues closest to new_playpos
+                if ((nearest_playpos == -1) ||
+                    (fabs(new_playpos - cue_position) < distance)) {
+                    nearest_playpos = cue_position;
+                    distance = fabs(new_playpos - cue_position);
+                }
+            }
+
+            if (nearest_playpos == -1) {
+                if (new_playpos >= 0)
+                    //never found an appropriate cue, so don't seek?
+                    return;
+                //if negative, allow a seek by falling down to the bottom
+            } else {
+                slotControlSeekAbs((float)nearest_playpos);
+                return;
+            }
+        }
+    }
+    //just seek where it wanted to originally
+    slotControlSeek(change);
+#endif
+}
 
 // WARNING: This method runs in both the GUI thread and the Engine Thread
 void EngineBuffer::slotControlSeek(double change)
 {
-    if(isnan(change) || change > 1.0 || change < 0.0) {
+    if(isnan(change) || change > 1.14 || change < -1.14) {
         // This seek is ridiculous.
         return;
     }
 
     // Find new playpos, restrict to valid ranges.
     double new_playpos = round(change*file_length_old);
+
     if (new_playpos > file_length_old)
         new_playpos = file_length_old;
-    if (new_playpos < 0.)
-        new_playpos = 0.;
+    //if (new_playpos < 0.)
+    //   new_playpos = 0.;
 
     // Ensure that the file position is even (remember, stereo channel files...)
     if (!even((int)new_playpos))
@@ -445,6 +532,7 @@
     CSAMPLE * pOutput = (CSAMPLE *)pOut;
 
     bool bCurBufferPaused = false;
+    double rate;
 
     if (!m_pTrackEnd->get() && pause.tryLock()) {
 
@@ -462,19 +550,22 @@
 
         bool paused = playButton->get() != 0.0f ? false : true;
 
-        double rate = m_pRateControl->calculateRate(baserate, paused);
+        rate = m_pRateControl->calculateRate(baserate, paused);
         //qDebug() << "rate" << rate << " paused" << paused;
 
         // If the rate has changed, set it in the scale object
         if (rate != rate_old || m_bScalerChanged) {
             // The rate returned by the scale object can be different from the wanted rate!
-
-            //XXX: Trying to force RAMAN to read from correct
-            //     playpos when rate changes direction - Albert
-            if (m_bScalerChanged || (rate_old <= 0 && rate > 0) ||
-                (rate_old >= 0 && rate < 0))
-            {
+            // Make sure new scaler has proper position
+            if (m_bScalerChanged) {
                 setNewPlaypos(filepos_play);
+            } else if (m_pScale != m_pScaleLinear) { //linear scaler does this part for us now
+                //XXX: Trying to force RAMAN to read from correct
+                //     playpos when rate changes direction - Albert
+                if ((rate_old <= 0 && rate > 0) ||
+                    (rate_old >= 0 && rate < 0)) {
+                    setNewPlaypos(filepos_play);
+                }
             }
 
             rate_old = rate;
@@ -493,9 +584,10 @@
         // If we're playing past the end, playing before the start, or standing
         // still then by definition the buffer is paused.
         bCurBufferPaused = rate == 0 ||
-            (at_start && backwards) ||
+            //(at_start && backwards) ||
             (at_end && !backwards);
 
+
         // If the buffer is not paused, then scale the audio.
         if (!bCurBufferPaused) {
             CSAMPLE *output;
@@ -531,9 +623,9 @@
 
             // Adjust filepos_play by the amount we processed.
             filepos_play += idx;
-            filepos_play = math_max(0, filepos_play);
-            // We need the above protection against negative playpositions
-            // in case SoundTouch/EngineBufferSoundTouch gives us too many samples.
+            //filepos_play = math_max(0, filepos_play);
+            //// We need the above protection against negative playpositions
+            //// in case SoundTouch/EngineBufferSoundTouch gives us too many samples.
 
             // Get rid of annoying decimals that the scaler sometimes produces
             filepos_play = round(filepos_play);
@@ -599,7 +691,7 @@
 
         bool repeat_enabled = m_pRepeat->get() != 0.0f;
 
-        bool end_of_track = (at_start && backwards) ||
+        bool end_of_track = //(at_start && backwards) ||
             (at_end && !backwards);
 
         // If playbutton is pressed, check if we are at start or end of track
@@ -624,27 +716,57 @@
     // (hopefully) before the next callback.
     m_pReader->wake();
 
-    // Force ramp in if this is the first buffer during a play
     if (m_bLastBufferPaused && !bCurBufferPaused) {
-        // Ramp from zero
-        int iLen = math_min(iBufferSize, kiRampLength);
-        float fStep = pOutput[iLen-1]/(float)iLen;
-        for (int i=0; i<iLen; ++i)
-            pOutput[i] = fStep*i;
-
-    }
-    // Force ramp out if this is the first buffer to be paused.
-    else if (!m_bLastBufferPaused && bCurBufferPaused) {
-        rampOut(pOut, iBufferSize);
-    }
-    // If the previous buffer was paused and we are currently paused, then
-    // memset the output to zero.
-    else if (m_bLastBufferPaused && bCurBufferPaused) {
-        memset(pOutput, 0, sizeof(pOutput[0])*iBufferSize);
+        if (fabs(rate) > 0.005) //at very slow forward rates, don't ramp up
+            m_iRampState = ENGINE_RAMP_UP;
+    } else if (!m_bLastBufferPaused && bCurBufferPaused) {
+        m_iRampState = ENGINE_RAMP_DOWN;
+    } else { //we are not changing state
+        //make sure we aren't accidentally ramping down
+        //this is how we make sure that ramp value will become 1.0 eventually
+        if (fabs(rate) > 0.005 && m_iRampState != ENGINE_RAMP_UP && m_fRampValue < 1.0)
+            m_iRampState = ENGINE_RAMP_UP;
+    }
+
+    //let's try holding the last sample value constant, and pull it
+    //towards zero
+    float ramp_inc = 0;
+    if (m_iRampState == ENGINE_RAMP_UP) {
+        ramp_inc = (m_iRampState * 0.2) / iBufferSize; //ramp up quickly (5 frames)
+    } else if (m_iRampState == ENGINE_RAMP_DOWN) {
+        ramp_inc = (m_iRampState * 0.08) / iBufferSize; //but down slowly
+    }
+
+    //float fakerate = rate * 30000 == 0 ? -5000 : rate*30000;
+    for (int i=0; i<iBufferSize; i+=2) {
+        if (bCurBufferPaused) {
+            float dither = (float)(rand() % 32768) / 32768 - 0.5; // dither
+            pOutput[i] = m_fLastSampleValue[0] * m_fRampValue + dither;
+            pOutput[i+1] = m_fLastSampleValue[1] * m_fRampValue + dither;
+        } else {
+            pOutput[i] = pOutput[i] * m_fRampValue;
+            pOutput[i+1] = pOutput[i+1] * m_fRampValue;
+        }
+
+        //writer << pOutput[i] <<  "\n";
+        m_fRampValue += ramp_inc;
+        if (m_fRampValue >= 1.0) {
+            m_iRampState = ENGINE_RAMP_NONE;
+            m_fRampValue = 1.0;
+        }
+        if (m_fRampValue <= 0.0) {
+            m_iRampState = ENGINE_RAMP_NONE;
+            m_fRampValue = 0.0;
+        }
+    }
+
+    if ((!bCurBufferPaused && m_iRampState == ENGINE_RAMP_NONE) ||
+        (bCurBufferPaused && m_fRampValue == 0.0)) {
+        m_fLastSampleValue[0] = pOutput[iBufferSize-2];
+        m_fLastSampleValue[1] = pOutput[iBufferSize-1];
     }
 
     m_bLastBufferPaused = bCurBufferPaused;
-    m_fLastSampleValue = pOutput[iBufferSize-1];
 }
 
 
@@ -656,15 +778,24 @@
 
     // Ramp to zero
     int i=0;
-    if (m_fLastSampleValue!=0.)
-    {
-        int iLen = math_min(iBufferSize, kiRampLength);
-        float fStep = m_fLastSampleValue/(float)iLen;
+    if (m_fLastSampleValue[0]!=0.) {
         // TODO(XXX) SSE
-        while (i<iLen)
-        {
-            pOutput[i] = fStep*(iLen-(i+1));
-            ++i;
+        if (pOutput[0] == 0) {
+            while (i<iBufferSize) {
+                float sigmoid = sigmoid_zero((float)(iBufferSize - i), (float)iBufferSize);
+                float dither = (float)(rand() % 32768) / 32768 - 0.5; // dither
+                pOutput[i] = (float)m_fLastSampleValue[0] * sigmoid + dither;
+                pOutput[i+1] = (float)m_fLastSampleValue[1] * sigmoid + dither;
+                i+=2;
+            }
+        } else {
+            while (i<iBufferSize) {
+                float sigmoid = sigmoid_zero((float)(iBufferSize - i), (float)iBufferSize);
+                float dither = (float)(rand() % 32768) / 32768 - 0.5; // dither
+                pOutput[i] = (float)pOutput[i] * sigmoid + dither;
+                pOutput[i+1] = (float)pOutput[i+1] * sigmoid + dither;
+                i+=2;
+               }
         }
     }
 
@@ -684,7 +815,7 @@
 
     double fFractionalPlaypos = 0.0;
     if (file_length_old!=0.) {
-        fFractionalPlaypos = math_max(0.,math_min(filepos_play,file_length_old));
+        fFractionalPlaypos = math_min(filepos_play,file_length_old);
         fFractionalPlaypos /= file_length_old;
     } else {
         fFractionalPlaypos = 0.;

=== modified file 'mixxx/src/engine/enginebuffer.h'
--- mixxx/src/engine/enginebuffer.h	2011-04-07 04:23:53 +0000
+++ mixxx/src/engine/enginebuffer.h	2011-04-16 23:24:33 +0000
@@ -25,6 +25,8 @@
 #include "trackinfoobject.h"
 #include "configobject.h"
 #include "rotary.h"
+//for the writer
+//#include <QtCore>
 
 class EngineControl;
 class BpmControl;
@@ -64,10 +66,18 @@
 const int TRACK_END_MODE_LOOP = 2;
 const int TRACK_END_MODE_PING = 3;
 
-// Maximum number of samples used to ramp to or from zero when playback is
-// stopped or started.
-const int kiRampLength = 50;
-
+//vinyl status constants
+//XXX: move this to vinylcontrol.h once thread startup is moved
+const int VINYL_STATUS_DISABLED = 0;
+const int VINYL_STATUS_OK = 1;
+const int VINYL_STATUS_WARNING = 2;
+const int VINYL_STATUS_ERROR = 3;
+
+const int ENGINE_RAMP_DOWN = -1;
+const int ENGINE_RAMP_NONE = 0;
+const int ENGINE_RAMP_UP = 1;
+
+//const int kiRampLength = 3;
 
 class EngineBuffer : public EngineObject
 {
@@ -105,6 +115,7 @@
     void slotControlStart(double);
     void slotControlEnd(double);
     void slotControlSeek(double);
+    void slotControlVinylSeek(double);
     void slotControlSeekAbs(double);
 
     // Request that the EngineBuffer load a track. Since the process is
@@ -205,6 +216,9 @@
     // Whether or not to repeat the track when at the end
     ControlPushButton* m_pRepeat;
 
+    ControlObject *m_pVinylStatus;  //Status of vinyl control
+    ControlObject *m_pVinylSeek;
+	
     /** Fwd and back controls, start and end of track control */
     ControlPushButton *startButton, *endButton;
 
@@ -219,11 +233,16 @@
 
     /** Holds the last sample value of the previous buffer. This is used when ramping to
       * zero in case of an immediate stop of the playback */
-    float m_fLastSampleValue;
+    float m_fLastSampleValue[2];
     /** Is true if the previous buffer was silent due to pausing */
     bool m_bLastBufferPaused;
+    float m_fRampValue;
+    int m_iRampState;
+    //int m_iRampIter;
 
     TrackPointer m_pCurrentTrack;
+    /*QFile df;
+    QTextStream writer;*/
 };
 
 #endif

=== modified file 'mixxx/src/engine/enginebufferscalelinear.cpp'
--- mixxx/src/engine/enginebufferscalelinear.cpp	2011-04-03 20:40:17 +0000
+++ mixxx/src/engine/enginebufferscalelinear.cpp	2011-04-16 23:24:33 +0000
@@ -20,8 +20,6 @@
 #include "mathstuff.h"
 #include "sampleutil.h"
 
-#define RATE_LERP_LENGTH 200
-
 EngineBufferScaleLinear::EngineBufferScaleLinear(ReadAheadManager *pReadAheadManager) :
     EngineBufferScale(),
     m_pReadAheadManager(pReadAheadManager)
@@ -30,16 +28,25 @@
     m_dTempo = 0.0f;
     m_fOldTempo = 1.0f;
     m_fOldBaseRate = 1.0f;
-    m_fPreviousL = 0.0f;
-    m_fPreviousR = 0.0f;
-    m_scaleRemainder = 0.0f;
+    m_dCurSampleIndex = 0.0f;
+    m_dNextSampleIndex = 0.0f;
+
+    for (int i=0; i<2; i++)
+        m_fPrevSample[i] = 0.0f;
 
     buffer_int = new CSAMPLE[kiLinearScaleReadAheadLength];
+    buffer_int_size = 0;
+
+    /*df.setFileName("mixxx-debug-scaler.csv");
+    df.open(QIODevice::WriteOnly | QIODevice::Text);
+    writer.setDevice(&df);
+    buffer_count=0;*/
     SampleUtil::applyGain(buffer_int, 0.0, kiLinearScaleReadAheadLength);
 }
 
 EngineBufferScaleLinear::~EngineBufferScaleLinear()
 {
+    //df.close();
     delete [] buffer_int;
 }
 
@@ -50,16 +57,18 @@
 
     m_dTempo = _tempo;
 
-    if (m_dTempo>MAX_SEEK_SPEED)
+    if (m_dTempo>MAX_SEEK_SPEED) {
         m_dTempo = MAX_SEEK_SPEED;
-    else if (m_dTempo < -MAX_SEEK_SPEED)
+    } else if (m_dTempo < -MAX_SEEK_SPEED) {
         m_dTempo = -MAX_SEEK_SPEED;
+    }
 
     // Determine playback direction
-    if (m_dTempo<0.)
+    if (m_dTempo<0.) {
         m_bBackwards = true;
-    else
+    } else {
         m_bBackwards = false;
+    }
 
     return m_dTempo;
 }
@@ -75,7 +84,6 @@
 void EngineBufferScaleLinear::clear()
 {
     m_bClear = true;
-    m_scaleRemainder = 0.0f;
 }
 
 
@@ -90,9 +98,67 @@
     return ((((a * frac_pos) - b_neg) * frac_pos + c) * frac_pos + x0);
 }
 
-/** Stretch a buffer worth of audio using linear interpolation */
-CSAMPLE * EngineBufferScaleLinear::scale(double, unsigned long buf_size,
-                                         CSAMPLE*, unsigned long)
+/** Determine if we're changing directions (scratching) and then perform
+    a stretch */
+CSAMPLE * EngineBufferScaleLinear::scale(double playpos, unsigned long buf_size,
+                                         CSAMPLE* pBase, unsigned long iBaseLength)
+{
+    float rate_add_new = m_dBaseRate;
+    float rate_add_old = m_fOldBaseRate; //Smoothly interpolate to new playback rate
+
+    // Guard against buf_size == 0
+    if ((int)buf_size == 0)
+        return buffer;
+
+    if (rate_add_new * rate_add_old < 0) {
+        //calculate half buffer going one way, and half buffer going
+        //the other way.
+
+        //first half: rate goes from old rate to zero
+        m_fOldBaseRate = rate_add_old;
+        m_dBaseRate = 0.0;
+        buffer = do_scale(buffer, buf_size/2, pBase, iBaseLength);
+
+        //reset prev sample so we can now read in the other direction
+        //(may not be necessary?)
+        if ((int)ceil(m_dCurSampleIndex)*2+1 < buffer_int_size) {
+            m_fPrevSample[0] = buffer_int[(int)ceil(m_dNextSampleIndex)*2];
+            m_fPrevSample[1] = buffer_int[(int)ceil(m_dNextSampleIndex)*2+1];
+        }
+
+        //if the buffer has extra samples, do a read so RAMAN ends up back where
+        //it should be
+        int extra_samples = buffer_int_size - (int)ceil(m_dCurSampleIndex)*2 - 2;
+        if (extra_samples > 0) {
+            if (extra_samples % 2 != 0)
+                extra_samples++;
+            qDebug() << "extra samples" << extra_samples;
+
+            m_pReadAheadManager->getNextSamples(rate_add_new,buffer_int,
+                                                 extra_samples);
+
+        }
+        //force a buffer read:
+        buffer_int_size=0;
+        //make sure the indexes stay correct for interpolation
+        m_dCurSampleIndex = 0 - m_dCurSampleIndex + floor(m_dCurSampleIndex);
+        m_dNextSampleIndex = 1.0 - (m_dNextSampleIndex - floor(m_dNextSampleIndex));
+
+        //second half: rate goes from zero to new rate
+        m_fOldBaseRate = 0.0;
+        m_dBaseRate = rate_add_new;
+        //pass the address of the sample at the halfway point
+        do_scale(&buffer[buf_size/2], buf_size/2, pBase, iBaseLength);
+
+        return buffer;
+    }
+
+    return do_scale(buffer, buf_size, pBase, iBaseLength);
+}
+
+/** Stretch a specified buffer worth of audio using linear interpolation */
+CSAMPLE * EngineBufferScaleLinear::do_scale(CSAMPLE* buf, unsigned long buf_size,
+                                         CSAMPLE* pBase, unsigned long iBaseLength)
 {
 
     long unscaled_samples_needed;
@@ -102,9 +168,6 @@
     float rate_add_diff = rate_add_new - rate_add_old;
     double rate_add_abs;
 
-    if ( rate_add_diff )
-        m_scaleRemainder = 0.0f;
-
     //Update the old base rate because we only need to
     //interpolate/ramp up the pitch changes once.
     m_fOldBaseRate = m_dBaseRate;
@@ -113,158 +176,194 @@
     // the new EngineBuffer implementation)
     new_playpos = 0.0;
 
-    const int iRateLerpLength = math_min(RATE_LERP_LENGTH, buf_size);
+    int iRateLerpLength = (int)buf_size;
 
     // Guard against buf_size == 0
     if (iRateLerpLength == 0)
-        return buffer;
+        return buf;
+
+
+    //We check for scratch condition in the public function, so this
+    //shouldn't happen
+    Q_ASSERT(rate_add_new * rate_add_old >= 0);
 
     // Simulate the loop to estimate how many samples we need
     double samples = 0;
 
-    for (int j = 0; j < iRateLerpLength; j+=2)
-    {
-        rate_add = (rate_add_diff) / iRateLerpLength * j + rate_add_old;
+    for (int j = 0; j < iRateLerpLength; j += 2) {
+        rate_add = (rate_add_diff) / (float)iRateLerpLength * (float)j + rate_add_old;
         samples += fabs(rate_add);
     }
 
     rate_add = rate_add_new;
     rate_add_abs = fabs(rate_add);
 
-    samples += (rate_add_abs * ((buf_size - iRateLerpLength)/2));
-    unscaled_samples_needed = ceil(samples);
-
-    if ( samples != unscaled_samples_needed)
-        m_scaleRemainder += (double)unscaled_samples_needed - samples;
-
-    bool carry_remainder = false;
-    if ((m_scaleRemainder > 1) || (m_scaleRemainder < 1))
-    {
-        long rem = (long)floor(m_scaleRemainder);
-
-
-        // Be very defensive about equating the remainder
-        // back into unscaled_samples_needed
-		if ((unscaled_samples_needed - rem) >= 1)
-		{
-            carry_remainder = true;
-            m_scaleRemainder -= rem;
-        }
+    //we're calculating mono samples, so divide remaining buffer by 2;
+    samples += (rate_add_abs * ((float)(buf_size - iRateLerpLength)/2));
+       unscaled_samples_needed = floor(samples);
+
+       //if the current position fraction plus the future position fraction
+       //loops over 1.0, we need to round up
+    if (m_dNextSampleIndex - floor(m_dNextSampleIndex) + samples - floor(samples) > 1.0) {
+        unscaled_samples_needed++;
     }
 
     // Multiply by 2 because it is predicting mono rates, while we want a stereo
     // number of samples.
     unscaled_samples_needed *= 2;
 
-    Q_ASSERT(unscaled_samples_needed >= 0);
-    Q_ASSERT(unscaled_samples_needed != 0);
-
-    int buffer_size = 0;
-    double buffer_index = 0;
-
-    long current_sample = 0;
-    long prev_sample = 0;
+    //0 is never the right answer
+    unscaled_samples_needed = math_max(2,unscaled_samples_needed);
+
     bool last_read_failed = false;
+    CSAMPLE prev_sample[2];
+    CSAMPLE cur_sample[2];
+    double prevIndex=0;
 
-    // Use new_playpos to count the new samples we touch.
-    new_playpos = 0;
+    prev_sample[0]=0;
+    prev_sample[1]=0;
+    cur_sample[0]=0;
+    cur_sample[1]=0;
 
     int i = 0;
     int screwups = 0;
-    while(i < buf_size)
-    {
-        prev_sample = current_sample;
-
-        current_sample = floor(buffer_index) * 2;
-        if (!even(current_sample))
-            current_sample++;
-
-        Q_ASSERT(current_sample % 2 == 0);
-        Q_ASSERT(current_sample >= 0);
-
-        //This code is so messed up. These ASSERTs should be enabled, but they actually
-        //fire because of bug(s).
-        //Q_ASSERT(prev_sample >= 0);
-        //Q_ASSERT(prev_sample-1 < kiLinearScaleReadAheadLength);
-        //the prev_sample-1 leaves room for the other sample in the stereo frame
-        //Instead, we're going to workaround the bug by just clamping prev_sample
-        //to make sure it stays in bounds:
-        prev_sample = math_min(kiLinearScaleReadAheadLength, prev_sample);
-        prev_sample = math_max(0, prev_sample);
-
-
-        if (prev_sample != current_sample) {
-            m_fPreviousL = buffer_int[prev_sample];
-            m_fPreviousR = buffer_int[prev_sample+1];
-        }
-
-        if (current_sample+1 >= buffer_size) {
+    while(i < buf_size) {
+        //shift indicies
+        prevIndex = m_dCurSampleIndex;
+        m_dCurSampleIndex = m_dNextSampleIndex;
+
+        //we're going to be interpolating between two samples, a lower (prev)
+        //and upper (cur) sample.  If the lower sample is off the end of the buffer,
+        //load it from the saved globals
+
+        if ((int)floor(m_dCurSampleIndex)*2+1 < buffer_int_size && m_dCurSampleIndex >= 0.0) {
+            m_fPrevSample[0] = prev_sample[0] = buffer_int[(int)floor(m_dCurSampleIndex)*2];
+            m_fPrevSample[1] = prev_sample[1] = buffer_int[(int)floor(m_dCurSampleIndex)*2+1];
+        } else {
+            prev_sample[0] = m_fPrevSample[0];
+            prev_sample[1] = m_fPrevSample[1];
+        }
+
+        //Smooth any changes in the playback rate over iRateLerpLength
+        //samples. This prevents the change from being discontinuous and helps
+        //improve sound quality.
+        if (i < iRateLerpLength) {
+            rate_add = (float)i * (rate_add_diff) / (float)iRateLerpLength + rate_add_old;
+            //rate_add = sigmoid_zero((float)i,(float)iRateLerpLength) * rate_add_diff + rate_add_old;
+        } else {
+            rate_add = rate_add_new;
+        }
+
+        // if we don't have enough samples, load some more
+        while ((int)ceil(m_dCurSampleIndex)*2+1 >= buffer_int_size) {
+            int old_bufsize = buffer_int_size;
+            //qDebug() << "buffer" << buffer_count << rate_add_old << rate_add_new << rate_add << i << m_dCurSampleIndex << buffer_int_size << unscaled_samples_needed;
             //Q_ASSERT(unscaled_samples_needed > 0);
             if (unscaled_samples_needed == 0) {
-	            unscaled_samples_needed = 2;
-	            screwups++;
+                //qDebug() << "screwup" << m_dCurSampleIndex << (int)ceil(m_dCurSampleIndex)*2+1 << buffer_int_size;
+                unscaled_samples_needed = 2;
+                screwups++;
             }
 
             int samples_to_read = math_min(kiLinearScaleReadAheadLength,
                                            unscaled_samples_needed);
 
-            buffer_size = m_pReadAheadManager
-                                ->getNextSamples(m_dBaseRate,buffer_int,
-                                                 samples_to_read);
-
-            if (m_dBaseRate > 0)
-                new_playpos += buffer_size;
-            else if (m_dBaseRate < 0)
-                new_playpos -= buffer_size;
-
-
-            if (buffer_size == 0 && last_read_failed) {
+            if(rate_add_new == 0) {
+                //qDebug() << "new rate was zero";
+                buffer_int_size = m_pReadAheadManager
+                                ->getNextSamples(rate_add_old,buffer_int,
+                                                 samples_to_read);
+                if (rate_add_old > 0) {
+                    new_playpos += buffer_int_size;
+                } else if (rate_add_old < 0) {
+                    new_playpos -= buffer_int_size;
+                }
+            } else {
+                buffer_int_size = m_pReadAheadManager
+                                ->getNextSamples(rate_add_new,buffer_int,
+                                                 samples_to_read);
+                if (rate_add_new > 0)
+                    new_playpos += buffer_int_size;
+                else if (rate_add_new < 0)
+                    new_playpos -= buffer_int_size;
+            }
+
+            if (buffer_int_size == 0 && last_read_failed) {
                 break;
             }
-            last_read_failed = buffer_size == 0;
-
-            unscaled_samples_needed -= buffer_size;
-            buffer_index = buffer_index - floor(buffer_index);
-
-            continue;
-        }
-
-        //Smooth any changes in the playback rate over iRateLerpLength
-        //samples. This prevents the change from being discontinuous and helps
-        //improve sound quality.
-        if (i < iRateLerpLength) {
-            rate_add = (rate_add_diff) / iRateLerpLength * i + rate_add_old;
-        }
-        else {
-            rate_add = rate_add_new;
-        }
-
-        CSAMPLE frac = buffer_index - floor(buffer_index);
+            last_read_failed = buffer_int_size == 0;
+
+            unscaled_samples_needed -= buffer_int_size;
+            //shift the index by the size of the old buffer
+            m_dCurSampleIndex -= old_bufsize / 2;
+            prevIndex -= old_bufsize / 2;
+            //fractions below 0 is ok, the ceil will bring it up to 0
+            //this happens sometimes, somehow?
+            //Q_ASSERT(m_dCurSampleIndex > -1.0);
+
+            //not sure this actually does anything, but it seems to help
+            if ((int)floor(m_dCurSampleIndex)*2 >= 0.0) {
+                m_fPrevSample[0] = prev_sample[0] = buffer_int[(int)floor(m_dCurSampleIndex)*2];
+                m_fPrevSample[1] = prev_sample[1] = buffer_int[(int)floor(m_dCurSampleIndex)*2+1];
+            }
+        }
+        //I guess?
+        if (last_read_failed)
+            break;
+
+        cur_sample[0] = buffer_int[(int)ceil(m_dCurSampleIndex)*2];
+        cur_sample[1] = buffer_int[(int)ceil(m_dCurSampleIndex)*2+1];
+
+        //rate_add was here
+
+        //for the current index, what percentage is it between the previous and the next?
+        CSAMPLE frac = m_dCurSampleIndex - floor(m_dCurSampleIndex);
 
         //Perform linear interpolation
-        buffer[i] = m_fPreviousL + frac * (buffer_int[current_sample] - m_fPreviousL);
-        buffer[i+1] = m_fPreviousR + frac * (buffer_int[current_sample+1] - m_fPreviousR);
-
+        buf[i] = (float)prev_sample[0] + frac * ((float)cur_sample[0] - (float)prev_sample[0]);
+        buf[i+1] = (float)prev_sample[1] + frac * ((float)cur_sample[1] - (float)prev_sample[1]);
+
+        //at extremely low speeds, dampen the gain to hide pops and clicks
+        //this does cause odd-looking linear waveforms that go to zero and back
+
+        //although enginevinylsoundemu does this, it works much better here
+        //because the gain ramps as the rate does
+        if (fabs(rate_add) < 0.5) {
+           float dither = (float)(rand() % 32768) / 32768 - 0.5; // dither
+           //float dither = 0;
+           float gainfrac = fabs(rate_add) / 0.5;
+           buf[i] = gainfrac * (float)buf[i] + dither;
+           buf[i+1] = gainfrac * (float)buf[i+1] + dither;
+        }
+
+        /*writer << QString("%1,%2,%3,%4\n").arg(buffer_count)
+                                         .arg(buffer[i])
+                                           .arg(prev_sample[0])
+                                           .arg(cur_sample[0]);
+        buffer_count++;*/
+
+        //increment the index for the next loop
         if (i < iRateLerpLength)
-            buffer_index += fabs(rate_add);
+            m_dNextSampleIndex = m_dCurSampleIndex + fabs(rate_add);
         else
-            buffer_index += rate_add_abs;
+            m_dNextSampleIndex = m_dCurSampleIndex + rate_add_abs;
 
         i+=2;
-    }
-
-    if ( carry_remainder )
-    {
-        m_fPreviousL = buffer_int[buffer_size-2];
-        m_fPreviousR = buffer_int[buffer_size-1];
-    }
-
+
+    }
     // If we broke out of the loop, zero the remaining samples
-    SampleUtil::applyGain(&buffer[i], 0.0f, buf_size-i);
+    // TODO(XXX) memset
+    //for (; i < buf_size; i += 2) {
+    //    buf[i] = 0.0f;
+    //    buf[i+1] = 0.0f;
+    //}
+
+    //Q_ASSERT(i>=buf_size);
+    SampleUtil::applyGain(&buf[i], 0.0f, buf_size-i);
 
     // It's possible that we will exit this function without having satisfied
     // this requirement. We may be trying to read past the end of the file.
     //Q_ASSERT(unscaled_samples_needed == 0);
 
-    return buffer;
+    return buf;
 }

=== modified file 'mixxx/src/engine/enginebufferscalelinear.h'
--- mixxx/src/engine/enginebufferscalelinear.h	2010-05-23 06:36:06 +0000
+++ mixxx/src/engine/enginebufferscalelinear.h	2011-04-16 23:24:33 +0000
@@ -34,13 +34,17 @@
 public:
     EngineBufferScaleLinear(ReadAheadManager *pReadAheadManager);
     ~EngineBufferScaleLinear();
-    CSAMPLE *scale(double playpos, unsigned long buf_size, 
+    CSAMPLE *scale(double playpos, unsigned long buf_size,
                    CSAMPLE* pBase, unsigned long iBaseLength);
+
     void setBaseRate(double dBaseRate);
     double setTempo(double dTempo);
     void clear();
 
 private:
+    CSAMPLE *do_scale(CSAMPLE* buf, unsigned long buf_size,
+                   CSAMPLE* pBase, unsigned long iBaseLength);
+
     /** Holds playback direction */
     bool m_bBackwards;