Merge lp:~rryan/mixxx/atomic-co into lp:~mixxxdevelopers/mixxx/atomic-co

[RJ Skerry-Ryan]

[RJ Skerry-Ryan (rryan)]

I'm getting really excited about these control changes!

* Create a value wrapper around COBase values -- ControlNumericPrivate (CNP).
* Add a static creation method / hash index of existing CNPs similar to CO.
* Add a ControlBehavior class hierarchy that encodes all the behaviors that CO/COPushButton/COTTRotary/COPotmeter/COLogpotmere/COLinpotmeter/etc. all used to have built in.
* Remove all value-space to parameter-space conversion methods from CO hierarchy (e.g. valueToWidget/valueFromWidget).
* Get rid of CO / COT proxying. CO and COT both refer to CNP now and are equals in the sense that they both make requests to CNP. The only difference is that CO also creates a CNP when it is created for the first time and sets its behavior while a COT only binds to an existing CNP.

* Add valueChangedFromEngine and valueChangedByThis signals to CO and COT respectively. You'll see that CNP solves the issue that was previously solved by the sync thread -- all mutations (add/sub/set/reset) to the CNP include a pointer to the setter. This is re-broadcast by the CNP and so CO/COT can check the pointer and choose to emit either valueChanged() or valueChangedFromEngine/valueChangedByThis().

I'm only keeping the name valueChangedFromEngine name on the CO to keep backwards compatibility with other engine branches that are still unmerged (e.g. engine-control-refactor).

I'm really liking where this is going. There is really no difference between CO and COT except the creation of a CNP and setting of a Behavior in the CO. We could easily swap this out with a static factory method like Control::createPushButton(options...) that returned a COT-style object (that we could finally rename as Control* to keep things shorter). We could also flatten the CO hierarchy if the behavior-setting was done by a factory/static method. ControlPotmeter is the only standout there since other parts of Mixxx introspect on the control using dynamic_cast. Those hacks should be replaced with something more generic at the CNP layer that lets you ask things about the behavior.

[Daniel Schürmann (daschuer)]

Hi RJ,

Here only some edges in advanced, not a complete review.

* Since ControlObjectBase is not a base class any more, we should rename it to ControlObjectAtomic
* the name ControlNumericPrivate is fine for now, but if we want to finaly allow other numeric types, this should be more specific. What about ControlDoublePrivate?
http://mixxx.org/wiki/doku.php/revamped_control_system#control_object_types
* I am not sure if I like your m_pBehavior logic. It looks like you intended to make it also non blocking thread save
But I think it is not required, because only the CO owner should be allowed to set the behaviour of the CO.
It is required to change from elsewhere?
I think your solution might be not entirely save, because this check may fail:
return m_pBehavior ? m_pBehavior->defaultValue(default_value) : default_value;
m_pBehavior may change to NULL or from NULL between the check and the use.
ControlObjectBase<ControlNumericBehaviour> would be a solution but again I don't think it is required.
* We schould check the same for

[Daniel Schürmann (daschuer)]

.. m_defaultValue.
* I would like to get rid of sub and add. It may implies that it is an atomic operation.
* We may introduce a One reader version, instead where sub and add is save.
* The same issue may occur for all other read modify write actions inside the user code.
* We only have to decide if we verify the use by the CPU (overhead) or if we rely on the correctness of the user code?

[Daniel Schürmann (daschuer)]

I like the idea of having a COT, which controls the value change signal for the own changes.

I am not sure if I have fully understand the new behaviour bit here are my comments:

I do not like the idea that ControlObject receives signals. For me it is not clear in which thread it lives.
And I would like to allow two QObjects in the same thread communicate with signals.

What about this:
* An Object has a COT member with set(double value);
* The COT calls set(value, this) of the CO
* The CO emits valueChanged(double value, QObject* sender) in any case
* COT is connected to this signal and remits valueChanged(double value) in case this != sender

This allows that all other QObjects will receive the valueChange signals regardless in which thread it lives.
The resend of COT is "cheap" a direct connection in any case.

Code that is resend resistant, can work with CO without COT the wrapper.

COT should be renamed to something like ControlObjectValve

review: Needs Fixing

[RJ Skerry-Ryan (rryan)]

> * Since ControlObjectBase is not a base class any more, we should rename it to ControlObjectAtomic

Sounds good to me.

> * the name ControlNumericPrivate is fine for now, but if we want to finaly allow other numeric types, this should be more specific. What about ControlDoublePrivate?
http://mixxx.org/wiki/doku.php/revamped_control_system#control_object_types

Good point, I hadn't considered we would want uint types. ControlDoublePrivate seems good. Maybe behaviors should be templated to save common logic across the value types?

> * I am not sure if I like your m_pBehavior logic. It looks like you intended to make it also non blocking thread save But I think it is not required, because only the CO owner should be allowed to set the behaviour of the CO. It is required to change from elsewhere?

I didn't want to limit who could setBehavior(). We may want to do it from elsewhere in the future?

> I think your solution might be not entirely save, because this check may fail:
return m_pBehavior ? m_pBehavior->defaultValue(default_value) : default_value;
m_pBehavior may change to NULL or from NULL between the check and the use.
ControlObjectBase<ControlNumericBehaviour> would be a solution but again I don't think it is required.

Oops! Good point. I'll fix that. The only reason I used QAtomicPointer was to do a fetchAndSetRelaxed() to atomically swap the pointer for a new one. All other accesses should only need normal pointer access.

> * We schould check the same for m_defaultValue.

In this case I think we should keep COBase for defaultValue (And in the future other Control properties like a 'disabled'). In the future (e.g. in effects) the user may be able to tweak the default value of a control that represents an effect parameter so it's possible that it would change rapidly in response to user input and be accessed at the same time by another thread.

> * I would like to get rid of sub and add. It may implies that it is an atomic operation.

We could remove them. The only use of sub/add is in RateControl at the moment. I kind of like them as part of the API but I agree it gives the impression of atomicity.

> * We may introduce a One reader version, instead where sub and add is save.

Hm, given we only found one place to use sub/add I don't know if it's worth the effort.

> * The same issue may occur for all other read modify write actions inside the user code.

Yea, ControlPotmeter for example doesn't use add()/sub() for increment/decrement. It has the same issue where it isn't atomic. Could we extend the COBase API to include add/sub? That's a little odd because COBase isn't just for numeric types. It could allow you to implement operator+/operator- on a custom type if you want to atomically do something to it. Or in the future we could use c++11 lambdas and pass a lambda into COBase that is be used to mutate the value.

> * We only have to decide if we verify the use by the CPU (overhead) or if we rely on the correctness of the user code?

I think a balance is good. Relying on user code to be correct too much will get us into trouble since not everyone writing user code is fully aware of all the details of the control system (a good ex...

[RJ Skerry-Ryan (rryan)]

> I do not like the idea that ControlObject receives signals. For me it is not clear in which thread it lives.

The only signal it gets is a DirectConnection so the thread shouldn't matter.

> And I would like to allow two QObjects in the same thread communicate with signals.

Could you explain more? I don't think I get it.

> What about this:
> * An Object has a COT member with set(double value);
> * The COT calls set(value, this) of the CO
> * The CO emits valueChanged(double value, QObject* sender) in any case
> * COT is connected to this signal and remits valueChanged(double value) in case this != sender

> This allows that all other QObjects will receive the valueChange signals regardless in which thread it lives.
> The resend of COT is "cheap" a direct connection in any case.

Yea, I also consider DirectConnection to be cheap performance-wise.

Basically, what I've implemented is almost exactly what you're describing except it has some additional benefits. Think of it like this:

* I have renamed ControlObject to ControlNumericPrivate.
* I pulled out all the logic that was previously specialized by sub-classing ControlObject into ControlBehavior.
* All of the previous ControlObject classes (CO, ControlPotmeter, ControlPushButton, etc.) have now been converted into ControlObjectThreads except they also create a CNP and set its behavior if it does not exist.

> Code that is resend resistant, can work with CO without COT the wrapper.

No code in Mixxx has been consciously written to be resend resistant except the slots that intentionally listen to both valueChanged and valueChangedFromEngine. If any other code is resend resistant then that is purely an accident :). Making CO emit valueChanged() for every set() is super dangerous.

The benefits are:

* Separating the behavior of a control from its type. In the future when we have multiple control types that you can lookup it will be handy to be able to represent the behavior separately from the plumbing of the values. It could also allow injection of logic into a control from outside. For example, if you wanted to make a custom control that only allowed set() under a certain circumstance, you could sub-class a behavior to describe the logic you desire and then set your custom behavior on your control.

* No more master/slave relationship between CO and COT. The reason it was this way was because the CO system was designed to only be used in the engine. Today controls are defined and used everywhere in Mixxx and it's really more of a shared key-value store than it is a way to communicate with the engine. Plus, we have to deal with ugly things like NULL-ifying our pointer to the CO when it is deleted in the COT and every time you want to create a COT, you have to call ControlObject::getControl() first. The way I have it, there is still a master/slave but the master is not available to anyone for direct use. CNP is the master, both CO and COT are slaves.

* This will benefit the engine-control-refactor branch. In that branch, CO is not used to communicate with the engine anymore. There is a new type, a CallbackControl which is connected to the CO system via a FIFO of control changes. The...

[Owen Williams (ywwg)]

How much rewriting is this going to require, such as for my master_sync branch which has a lot of controlobject fiddliness?

[Daniel Schürmann (daschuer)]

> How much rewriting is this going to require, such as for my master_sync branch
> which has a lot of controlobject fiddliness?

This will be definitely a problem if we go to much a head with this branch.
I think in the current state there is some assembly line work required but since a controlObject is still a control Object there should be no logic changes required.

So I think we should try to finish and merge a branch soon, which has proved that ControlObjectBase is working.

[RJ Skerry-Ryan (rryan)]

> How much rewriting is this going to require, such as for my master_sync branch which has a lot of controlobject fiddliness?

For this branch, if we keep the separation between valueChanged and valueChangedFromEngine then it shouldn't need many/any changes.

For engine-control-refactor, the changes will be significant (hopefully mostly cosmetic though, the logic will need a review). I suggest getting master_sync merged before engine-control-refactor :).

[Daniel Schürmann (daschuer)]

> Maybe behaviors should be templated to save common logic across
> the value types?

Yes, we have only to deal with the not temple-atable Qt signals

> > * I would like to get rid of sub and add. It may implies that it is an
> atomic operation.
>
> We could remove them. The only use of sub/add is in RateControl at the moment.
> I kind of like them as part of the API but I agree it gives the impression of
> atomicity.

OK then, lets remove them

> > * The same issue may occur for all other read modify write actions inside
> the user code.
>
> Yea, ControlPotmeter for example doesn't use add()/sub() for
> increment/decrement. It has the same issue where it isn't atomic. Could we
> extend the COBase API to include add/sub? That's a little odd because COBase
> isn't just for numeric types. It could allow you to implement
> operator+/operator- on a custom type if you want to atomically do something to
> it. Or in the future we could use c++11 lambdas and pass a lambda into COBase
> that is be used to mutate the value.

Yes, we can implement an lockfee "read modify write" in the way ARM did it:
* Watch the current value
* Add or Sub a value
* Check the if the current value was changed in the meanwhile
* If Yes, retry.
I will try it out.

[lp:~rryan/mixxx/atomic-co]

3360. By Daniel Schürmann on 2013-05-15

merged rollback -r 3360 lp:~rryan/mixxx/atomic-co

3361. By Daniel Schürmann on 2013-05-15

set cReaderSlotCnt = std::numeric_limits<int>::max()

3362. By Daniel Schürmann on 2013-05-15

added alignement keywords

[Daniel Schürmann (daschuer)]

Played around with add and sub and I finaly came to the conclusion to remove it, in vafour of clean code.
It is only used once and it is fully save, if there is only one writer.

[RJ Skerry-Ryan (rryan)]

> COT should be renamed to something like ControlObjectValve

I'm up for making broad changes like this in the future but to be kind to every currently open branch author we should not rename either CO/COT/COTM/COTW until there are fewer major open branches.

[RJ Skerry-Ryan (rryan)]

> Played around with add and sub and I finaly came to the conclusion to remove it, in vafour of clean code.
> It is only used once and it is fully save, if there is only one writer.

Ok -- I'll do that in this branch.

[RJ Skerry-Ryan (rryan)]

> * the name ControlNumericPrivate is fine for now, but if we want to finaly allow other numeric types, this should be more specific. What about ControlDoublePrivate?

Fixed

> I think your solution might be not entirely save, because this check may fail:
return m_pBehavior ? m_pBehavior->defaultValue(default_value) : default_value;

Fixed

> Played around with add and sub and I finaly came to the conclusion to remove it, in vafour of clean code.

Fixed

[RJ Skerry-Ryan (rryan)]

I've re-reviewed the whole branch and merged with lp:~mixxxdevelopers/mixxx/atomic-co and think it's ready to merge into lp:mixxx. I can't wait to get this tested by bleeding-edgers. :)

[Sean M. Pappalardo (pegasus-renegadetech)]

"the name ControlNumericPrivate is fine for now, but if we want to finaly allow other numeric types, this should be more specific. What about ControlDoublePrivate?"

What happened to using QVariant?

[Daniel Schürmann (daschuer)]

I think QVariant is not suitable for our approach. Because I don't want to deal with type conversion inside of Mixxx.

I have planed to introduce the following types:

    double (legacy) for higest accuracy
    uint32_t, for fast access, and bool values
    uint8_t[4], for routing Midi Messages
    QString

These types should be modifiable by a common Script API using QScriptValue.

So we have the benefit of the typeless java script code but without performance overhead of QVariant.

http://mixxx.org/wiki/doku.php/revamped_control_system#control_object_types

[Sean M. Pappalardo (pegasus-renegadetech)]

Thanks, Daniel. That makes sense and it doesn't look to be too hard to add more types in the future if we need them.

Other comments/questions I have as I read through the changes:

* Before you get too far along, shouldn't the "Control" class be called "MixxxControl" or "InternalControl" to differentiate it from other types of controls, like external hardware ones? This will be especially important to avoid confusion if we plan to directly expose these to controller scripts.
* controlbehavior.h: don't the definitions of many of the classes have a bit too much code to have it all in the .h file?
* controlbehavior.h: hard-coding max and minPosition will be problematic if in the future we want to support controllers with 14-bit controls (spread across two messages) without scripting.
* controlvalue.h: what exactly does "sacrifice perfect consistency" mean? That occasionally a read value may be out of date? How likely is that to happen and can we somehow keep track of when it does incase we start seeing strange problems elsewhere as a result?
* midicontroller.cpp, line 270 (QString message): Come on, now. You actually made it harder to read. :)
* various places: isn't "getMidiValue" clearer than "getValueToMidi" since the output is a MIDI-scaled (0..127) value?
* controllinpotmeter.cpp and other places: That creation/deletion stuff looks weird to me, but it makes sense given the comment in control.h. As long as code outside the [Mixxx]Control classes won't have to do that jockeying, I'm good with it.

[Sean M. Pappalardo (pegasus-renegadetech)]

Oh, isn't a straight 1-bit bool better than a uint32_t for boolean values?

[Daniel Schürmann (daschuer)]

> Oh, isn't a straight 1-bit bool better than a uint32_t for boolean values?

Just noticed: We should introduce an int32_t control Object, not unsigned.

I do not like to have bool ControlObjects, because they have no value for invalid.
There is no performance overhead to store boolean into an int32_t.
It is only a question of min and max value of an control o0bject.

From the script, using boolean is fine.

[RJ Skerry-Ryan (rryan)]

Hey Sean,

> * Before you get too far along, shouldn't the "Control" class be called "MixxxControl" or "InternalControl" to differentiate it from other types of controls, like external hardware ones? This will be especially important to avoid confusion if we plan to directly expose these to controller scripts.

MixxxControl is just as redundant as ControlObject. Control is much shorter to type. Controller scripts already call these control (getControl/setControl).

> * controlbehavior.h: don't the definitions of many of the classes have a bit too much code to have it all in the .h file?

Probably a good point. I was hoping to promote inline-ability but since it's all virtual that's a lost cause anyway.

> * controlbehavior.h: hard-coding max and minPosition will be problematic if in the future we want to support controllers with 14-bit controls (spread across two messages) without scripting.

This is all copy-pasta from the various Control* implementations. The big bug with Mixxx's control system has always been hard-coding the limits of parameter space to be 0-127 to match with MIDI. I aim to change that in the future, not in this branch. Parameter space should be 0-1 always.

> * controlvalue.h: what exactly does "sacrifice perfect consistency" mean? That occasionally a read value may be out of date? How likely is that to happen and can we somehow keep track of when it does incase we start seeing strange problems elsewhere as a result?

Yep, that's right. See the discussion on the ~mixxxdevelopers/mixxx/atomic-co merge. The number of concurrent readers must exceed INT_MAX for inconsistent reads to occur.

> * midicontroller.cpp, line 270 (QString message): Come on, now. You actually made it harder to read. :)

*shrug* all of this MIDI message string formatting probably belongs in a utility library anyway like src/controllers/midi/util.h.

> * various places: isn't "getMidiValue" clearer than "getValueToMidi" since the output is a MIDI-scaled (0..127) value?

This full function name could be written as getValueToMidiParameterSpace so it's much clearer if you're thinking about it in terms of value space vs. parameter space (it's parallel with widget parameter space). This is another thing I want to totally get rid of from the control system anyway. There should just be one single parameter space for controls (instead of two parameter spaces, MIDI parameters and widget parameters) and the MIDI subsystem should do the translation to/from raw MIDI values within the controller MIDI subsystem.

> * controllinpotmeter.cpp and other places: That creation/deletion stuff looks weird to me, but it makes sense given the comment in control.h. As long as code outside the [Mixxx]Control classes won't have to do that jockeying, I'm good with it.

Yea, unless you want to write a custom behavior this is always going to be an implementation detail. The reason that exists is that the control itself might be located in a place where it is not ok to malloc/free (e.g. the engine callback) so it is the caller of setBehavior's job to manage the destruction of the behavior (e.g. by passing the pointer into a FIFO that is read from by a garbage cleanup thread)...

[Sean M. Pappalardo (pegasus-renegadetech)]

"There should just be one single parameter space for controls (instead of two parameter spaces, MIDI parameters and widget parameters) and the MIDI subsystem should do the translation to/from raw MIDI values within the controller MIDI subsystem."

For the record, I completely agree. (This was one thing that annoyed me during the controller subsystem rewrite, and it remains responsible for inconsistencies between straight XML-mapped controls and those set from script as well as code duplication to minimize them.)

[RJ Skerry-Ryan (rryan)]

> "the name ControlNumericPrivate is fine for now, but if we want to finaly allow other numeric types, this should be more specific. What about ControlDoublePrivate?"

> What happened to using QVariant?

I think we should still make a QVariant control so that things like scripts can pass around custom values without recompiling the Mixxx binary to add a new control type. We can also make a QVariant-based wrapper around controls for insertion into the controller engine. I agree w/ Daniel that it doesn't make sense to sacrifice the performance in areas where we know the type we will always use for the control.

> > Oh, isn't a straight 1-bit bool better than a uint32_t for boolean values?

> Just noticed: We should introduce an int32_t control Object, not unsigned.

> I do not like to have bool ControlObjects, because they have no value for invalid.
> There is no performance overhead to store boolean into an int32_t.
> It is only a question of min and max value of an control o0bject.

> From the script, using boolean is fine.

Daniel -- this is part of why your ControlValueAtomic really excites me. One thing that has always been a huge hack in Mixxx is co-opting the value space of a control to represent a disabled state or invalid value. We can just add these as properties of the control outside of its value. This is Control 2.0 stuff we have been talking about for a long time -- finally being able to make the GUI respond to a control being disconnected/inactive by graying it out . This is possible if we represent invalid/disabled as a separate value from the Control value.

And if we did that I think it would be fine to make a boolean control -- the API would be much nicer than what we do today to encode a bool in a double by always checking for v != 0.

[RJ Skerry-Ryan (rryan)]

> For the record, I completely agree. (This was one thing that annoyed me during the controller subsystem rewrite, and it remains responsible for inconsistencies between straight XML-mapped controls and those set from script as well as code duplication to minimize them.)

Yea, it's been this way since Mixxx 1.0 and it's a huge hack.

If we converted everything to have one parameter space then I think every control should have a setParameter()/getParameter() method that allows you to set the value in parameter space. I don't want to work on this (killing MIDI/widget parameter space) until we've merged this though. This branch diff is already quite large.

[Sean M. Pappalardo (pegasus-renegadetech)]

I also fully agree on both points, RJ.

[Sean M. Pappalardo (pegasus-renegadetech)]

> co-opting the value space of a control to represent a disabled state or invalid value

See the "scratch" CO where 0=disabled, but 1=play normal speed. Ugh. That's why I had to make a "scratch2" with a separate "scratch2_enabled" CO.

[RJ Skerry-Ryan (rryan)]

Barring strenuous objection, I'll go ahead and merge this. Daniel, do you agree this in a merge-worthy state?

[Daniel Schürmann (daschuer)]

Hi RJ,

Yes, I will merge it into lp:~mixxxdevelopers/mixxx/atomic-co now.

But I have not entirely reviewed and test it for merge into trunk.

I think I have not fully understand your COT changes yet so I have some code read todo.

---

the "scratch2" and "scratch2_enabled" think is definitely a subject for change in near future.
But there might be race conditions if we handle the scratch2_enabled like a property. For me it is a part of the atomic info scratch2 itself. If we introduce a int type control object we can easily reserve on value for invalid
eg -100 .. 100 + 0x7fffffff = invalid. A bool becomes 0 .. 1 + 0x7fffffff = invalid;
Or we can introduce a bitfield struct like this
struct {
   int value : 31;
   int invalid : 1;
}
Or if we don't mind using the ring implementation of ControlValueAtomic:
struct {
   double value;
   bool invalid;
}

In this way we never have an invalid flag on a valid value or vice versa.

review: Approve

[RJ Skerry-Ryan (rryan)]

In that case, let's merge to lp:mixxx. Owen is waiting on this to get
master-sync merged. There will be logic issues we run into where parts of
Mixxx have not expected the CO and COT value to be flattened but we will
have to fix those as we come to them. The sooner we can get trunk testers
trying it out the better.

On Thu, May 16, 2013 at 4:48 PM, Daniel Schürmann <email address hidden>wrote:

> Review: Approve
>
> Hi RJ,
>
> Yes, I will merge it into lp:~mixxxdevelopers/mixxx/atomic-co now.
>
> But I have not entirely reviewed and test it for merge into trunk.
>
> I think I have not fully understand your COT changes yet so I have some
> code read todo.
>
> ---
>
> the "scratch2" and "scratch2_enabled" think is definitely a subject for
> change in near future.
> But there might be race conditions if we handle the scratch2_enabled like
> a property. For me it is a part of the atomic info scratch2 itself. If we
> introduce a int type control object we can easily reserve on value for
> invalid
> eg -100 .. 100 + 0x7fffffff = invalid. A bool becomes 0 .. 1 + 0x7fffffff
> = invalid;
> Or we can introduce a bitfield struct like this
> struct {
> int value : 31;
> int invalid : 1;
> }
> Or if we don't mind using the ring implementation of ControlValueAtomic:
> struct {
> double value;
> bool invalid;
> }
>
> In this way we never have an invalid flag on a valid value or vice versa.
>
>
>
> --
> https://code.launchpad.net/~rryan/mixxx/atomic-co/+merge/163831
> You are the owner of lp:~rryan/mixxx/atomic-co.
>

[lp:~rryan/mixxx/atomic-co]

3363. By Daniel Schürmann on 2013-05-16

merged from lp:~rryan/mixxx/atomic-co

[Daniel Schürmann (daschuer)]

OK, I will be finished today :-)

=== removed file 'mixxx/.cproject'
--- mixxx/.cproject	2013-03-13 21:41:26 +0000
+++ mixxx/.cproject	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="0.1101443865">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1101443865" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="mixxx" buildProperties="" description="" id="0.1101443865" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.1101443865." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.base.584041307" name="Linux GCC" resourceTypeBasedDiscovery="false" superClass="cdt.managedbuild.toolchain.gnu.base">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.351911640" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder arguments="-j2 clementine=0" cleanBuildTarget="-c" command="scons" id="cdt.managedbuild.target.gnu.builder.base.2000599252" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1227507869" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.919897767" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-								<option id="gnu.cpp.compiler.option.include.paths.2035064794" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="/usr/include/qt4"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/Qt"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtCore"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtGui"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtOpenGL"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtXml"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtSvg"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtSql"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtScript"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtXmlPatterns"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtNetwork"/>
-									<listOptionValue builtIn="false" value="/usr/include/qt4/QtWebKit"/>
-									<listOptionValue builtIn="false" value="/usr/include/"/>
-									<listOptionValue builtIn="false" value="/usr/include/c++/4.5"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.2028780733" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="&quot;offsetof(Itdb_Track, artist)=1&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1034465664" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.36640467" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.293455491" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="&quot;offsetof(Itdb_Track, artist)=1&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1672612692" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1647233207" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.316845026" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.654332197" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1421936031" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1129083033" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="mixxx.null.1175989019" name="mixxx"/>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="1">
-		<resource resourceType="PROJECT" workspacePath="/mixxx"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="0.1101443865;0.1101443865.;cdt.managedbuild.tool.gnu.c.compiler.base.36640467;cdt.managedbuild.tool.gnu.c.compiler.input.1672612692">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="0.1101443865;0.1101443865.;cdt.managedbuild.tool.gnu.cpp.compiler.base.919897767;cdt.managedbuild.tool.gnu.cpp.compiler.input.1034465664">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="0.1101443865">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath="/home/daniel/workspace/.metadata/.plugins/org.eclipse.cdt.ui/mixxx.build.log"/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="specsFile">
-					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="g++" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
-			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath="/home/daniel/workspace/.metadata/.plugins/org.eclipse.cdt.ui/mixxx.build.log"/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="makefileGenerator">
-					<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
-		</scannerConfigBuildInfo>
-	</storageModule>
-</cproject>

=== removed file 'mixxx/.gdbinit'
--- mixxx/.gdbinit	2013-03-13 21:41:26 +0000
+++ mixxx/.gdbinit	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-dir ~/workspace/qt/src/corelib
-dir ~/workspace/qt/src/corelib/io
-dir ~/workspace/qt/src/gui
-dir ~/workspace/qt/src/gui/image
-dir ~/workspace/qt/src/gui/kernel
-dir ~/workspace/qt/src/network
-dir ~/workspace/qt/src/sql
-dir ~/workspace/qt/src/sql/drivers/sqlit
-dir ~/workspace/qt/src/opengl
-dir ~/workspace/sqlite/sqlite3-3.7.4
-dir ~/workspace/daschuer-mixxx-clementine/src
-dir ~/workspace/daschuer-mixxx-clementine/src/core
-dir ~/workspace/daschuer-mixxx-clementine/ext
-dir ~/workspace/daschuer-mixxx-clementine/3rdparty
-
-
-python
-import sys
-
-sys.path.insert(0, '/home/daniel/workspace')
-from qt4 import register_qt4_printers
-register_qt4_printers (None)
-end
-set print pretty 1
-set charset UTF-8
-

=== removed file 'mixxx/.project'
--- mixxx/.project	2013-03-13 21:41:26 +0000
+++ mixxx/.project	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>mixxxco</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value>-j2 clementine=0</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>scons</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>-c</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

=== modified file 'mixxx/Mixxx-Manual.pdf'
Binary files mixxx/Mixxx-Manual.pdf	2011-12-23 22:25:23 +0000 and mixxx/Mixxx-Manual.pdf	2013-05-16 01:44:29 +0000 differ
=== modified file 'mixxx/build/debian/changelog'
--- mixxx/build/debian/changelog	2012-06-21 19:43:01 +0000
+++ mixxx/build/debian/changelog	2013-05-16 01:44:29 +0000
@@ -1,3 +1,9 @@
+mixxx (1.11.0-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+
+ -- RJ Ryan <[e-mail]>  Thu, 09 May 2013 01:19:27 -0400
+
 mixxx (1.11.0~beta1-0ubuntu1) lucid; urgency=low
 
   * New upstream beta release

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2013-05-11 22:59:25 +0000
+++ mixxx/build/depends.py	2013-05-16 01:44:29 +0000
@@ -113,6 +113,14 @@
         if not conf.CheckLib(libs):
             raise Exception('Did not find libogg.a, libogg.lib, or the libogg development headers')
 
+        # libvorbisenc only exists on Linux, OSX and mingw32 on Windows. On
+        # Windows with MSVS it is included in vorbisfile.dll. libvorbis and
+        # libogg are included from build.py so don't add here.
+        if not build.platform_is_windows or build.toolchain_is_gnu:
+            vorbisenc_found = conf.CheckLib(['libvorbisenc', 'vorbisenc'])
+            if not vorbisenc_found:
+                raise Exception('Did not find libvorbisenc.a, libvorbisenc.lib, or the libvorbisenc development headers.')
+
     def sources(self, build):
         return ['soundsourceoggvorbis.cpp']
 
@@ -412,18 +420,18 @@
         sources = ["mixxxkeyboard.cpp",
 
                    "configobject.cpp",
+                   "control/control.cpp",
+                   "control/controlbehavior.cpp",
                    "controlobjectthread.cpp",
                    "controlobjectthreadwidget.cpp",
                    "controlobjectthreadmain.cpp",
                    "controlevent.cpp",
                    "controllogpotmeter.cpp",
                    "controlobject.cpp",
-                   "controlnull.cpp",
                    "controlpotmeter.cpp",
                    "controllinpotmeter.cpp",
                    "controlpushbutton.cpp",
                    "controlttrotary.cpp",
-                   "controlbeat.cpp",
 
                    "dlgpreferences.cpp",
                    "dlgprefsound.cpp",
@@ -434,10 +442,8 @@
                    "controllers/dlgprefnocontrollers.cpp",
                    "dlgprefplaylist.cpp",
                    "dlgprefcontrols.cpp",
-                   "dlgprefbpm.cpp",
                    "dlgprefreplaygain.cpp",
                    "dlgprefnovinyl.cpp",
-                   "dlgbpmscheme.cpp",
                    "dlgabout.cpp",
                    "dlgprefeq.cpp",
                    "dlgprefcrossfader.cpp",
@@ -465,7 +471,7 @@
                    "engine/engineflanger.cpp",
                    "engine/enginevumeter.cpp",
                    "engine/enginevinylsoundemu.cpp",
-                   "engine/enginesidechain.cpp",
+                   "engine/sidechain/enginesidechain.cpp",
                    "engine/enginefilterbutterworth8.cpp",
                    "engine/enginexfader.cpp",
                    "engine/enginemicrophone.cpp",
@@ -485,7 +491,6 @@
 
                    "analyserrg.cpp",
                    "analyserqueue.cpp",
-                   "analyserbpm.cpp",
                    "analyserwaveform.cpp",
 
                    "controllers/controller.cpp",
@@ -577,6 +582,7 @@
                    "library/recording/recordingfeature.cpp",
                    "dlgrecording.cpp",
                    "recording/recordingmanager.cpp",
+                   "engine/sidechain/enginerecord.cpp",
 
                    # External Library Features
                    "library/baseexternallibraryfeature.cpp",
@@ -698,8 +704,9 @@
                    "dlgprefrecord.cpp",
                    "playerinfo.cpp",
 
-                   "recording/enginerecord.cpp",
-                   "recording/encoder.cpp",
+                   "encoder/encoder.cpp",
+                   "encoder/encodermp3.cpp",
+                   "encoder/encodervorbis.cpp",
 
                    "segmentation.cpp",
                    "tapfilter.cpp",
@@ -743,10 +750,8 @@
         build.env.Uic4('dlgprefcontrolsdlg.ui')
         build.env.Uic4('dlgprefeqdlg.ui')
         build.env.Uic4('dlgprefcrossfaderdlg.ui')
-        build.env.Uic4('dlgprefbpmdlg.ui')
         build.env.Uic4('dlgprefreplaygaindlg.ui')
         build.env.Uic4('dlgprefbeatsdlg.ui')
-        build.env.Uic4('dlgbpmschemedlg.ui')
         # build.env.Uic4('dlgbpmtapdlg.ui')
         build.env.Uic4('dlgprefvinyldlg.ui')
         build.env.Uic4('dlgprefnovinyldlg.ui')

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2013-05-01 20:29:44 +0000
+++ mixxx/build/features.py	2013-05-16 01:44:29 +0000
@@ -453,8 +453,6 @@
             build.env.Append(CPPPATH=[self.INTERNAL_VAMP_PATH])
             self.INTERNAL_LINK = True
 
-        build.env.Append(CPPDEFINES = '__VAMP__')
-
         # Needed on Linux at least. Maybe needed elsewhere?
         if build.platform_is_linux:
             # Optionally link libdl and libX11. Required for some distros.
@@ -802,14 +800,6 @@
         if not libshout_found:
             raise Exception('Could not find libshout or its development headers. Please install it or compile Mixxx without Shoutcast support using the shoutcast=0 flag.')
 
-        # libvorbisenc only exists on Linux, OSX and mingw32 on Windows. On
-        # Windows with MSVS it is included in vorbisfile.dll. libvorbis and
-        # libogg are included from build.py so don't add here.
-        if not build.platform_is_windows or build.toolchain_is_gnu:
-            vorbisenc_found = conf.CheckLib(['libvorbisenc', 'vorbisenc'])
-            if not vorbisenc_found:
-                raise Exception("libvorbisenc was not found! Please install it or compile Mixxx without Shoutcast support using the shoutcast=0 flag.")
-
         if build.platform_is_windows and build.static_dependencies:
             conf.CheckLib('winmm')
             conf.CheckLib('ws2_32')
@@ -817,9 +807,8 @@
     def sources(self, build):
         build.env.Uic4('dlgprefshoutcastdlg.ui')
         return ['dlgprefshoutcast.cpp',
-                'engine/engineshoutcast.cpp',
-                'recording/encodervorbis.cpp',
-                'recording/encodermp3.cpp']
+                'shoutcast/shoutcastmanager.cpp',
+                'engine/sidechain/engineshoutcast.cpp']
 
 
 class FFMPEG(Feature):

=== modified file 'mixxx/build/qtcreator/mixxx.pro'
--- mixxx/build/qtcreator/mixxx.pro	2011-11-11 22:18:56 +0000
+++ mixxx/build/qtcreator/mixxx.pro	2013-05-16 01:44:29 +0000
@@ -98,9 +98,7 @@
 }
 
 HEADERS += $$UI_DIR/ui_dlgaboutdlg.h \
-    $$UI_DIR/ui_dlgbpmschemedlg.h \
     $$UI_DIR/ui_dlgmidilearning.h \
-    $$UI_DIR/ui_dlgprefbpmdlg.h \
     $$UI_DIR/ui_dlgprefcontrolsdlg.h \
     $$UI_DIR/ui_dlgprefcrossfaderdlg.h \
     $$UI_DIR/ui_dlgprefeqdlg.h \
@@ -131,7 +129,6 @@
 # done
 
 HEADERS += \
-$$BASE_DIR/src/analyserbpm.h \
 $$BASE_DIR/src/analyser.h \
 $$BASE_DIR/src/analyserqueue.h \
 $$BASE_DIR/src/analyserwaveform.h \
@@ -162,10 +159,8 @@
 $$BASE_DIR/src/defs_version.h \
 $$BASE_DIR/src/dlgabout.h \
 $$BASE_DIR/src/dlgautodj.h \
-$$BASE_DIR/src/dlgbpmscheme.h \
 $$BASE_DIR/src/dlgladspa.h \
 $$BASE_DIR/src/dlgmidilearning.h \
-$$BASE_DIR/src/dlgprefbpm.h \
 $$BASE_DIR/src/dlgprefcontrols.h \
 $$BASE_DIR/src/dlgprefcrossfader.h \
 $$BASE_DIR/src/dlgprefeq.h \
@@ -373,7 +368,6 @@
 
 
 SOURCES += \
-$$BASE_DIR/src/analyserbpm.cpp \
 $$BASE_DIR/src/analyserqueue.cpp \
 $$BASE_DIR/src/analyserwaveform.cpp \
 $$BASE_DIR/src/analyserwavesummary.cpp \
@@ -396,10 +390,8 @@
 $$BASE_DIR/src/controlvaluedelegate.cpp \
 $$BASE_DIR/src/dlgabout.cpp \
 $$BASE_DIR/src/dlgautodj.cpp \
-$$BASE_DIR/src/dlgbpmscheme.cpp \
 $$BASE_DIR/src/dlgladspa.cpp \
 $$BASE_DIR/src/dlgmidilearning.cpp \
-$$BASE_DIR/src/dlgprefbpm.cpp \
 $$BASE_DIR/src/dlgprefcontrols.cpp \
 $$BASE_DIR/src/dlgprefcrossfader.cpp \
 $$BASE_DIR/src/dlgprefeq.cpp \
@@ -622,9 +614,7 @@
 FORMS += \
 $$BASE_DIR/src/dlgaboutdlg.ui \
 $$BASE_DIR/src/dlgautodj.ui \
-$$BASE_DIR/src/dlgbpmschemedlg.ui \
 $$BASE_DIR/src/dlgmidilearning.ui \
-$$BASE_DIR/src/dlgprefbpmdlg.ui \
 $$BASE_DIR/src/dlgprefcontrolsdlg.ui \
 $$BASE_DIR/src/dlgprefcrossfaderdlg.ui \
 $$BASE_DIR/src/dlgprefeqdlg.ui \

=== modified file 'mixxx/plugins/soundsourcem4a/SConscript'
--- mixxx/plugins/soundsourcem4a/SConscript	2011-03-07 22:25:20 +0000
+++ mixxx/plugins/soundsourcem4a/SConscript	2013-05-16 01:44:29 +0000
@@ -15,7 +15,6 @@
     "soundsourcem4a.cpp",  # MP4/M4A Support through FAAD/libmp4v2
 ]
 
-
 #Tell SCons to build the SoundSourceM4A plugin
 #=========================
 if int(build.flags['faad']):
@@ -24,7 +23,7 @@
     conf = Configure(env)
 
     have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
-    have_mp4 = (have_mp4v2_h and conf.CheckLib(['mp4v2', 'libmp4v2'])) or \
+    have_mp4 = conf.CheckLib(['mp4v2', 'libmp4v2']) or \
         conf.CheckLib('mp4')
 
     have_faad = conf.CheckLib(['faad', 'libfaad'])

=== modified file 'mixxx/res/controllers/Vestax VCI-300.midi.xml' (properties changed: +x to -x)
=== modified file 'mixxx/res/controllers/Vestax-VCI-300-scripts.js' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/CHANGELOG.txt' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/skin.xml' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Outline1024x768-XGA/CHANGELOG.txt' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Outline1024x768-XGA/skin.xml' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Outline800x480-WVGA/skin.xml' (properties changed: +x to -x)
=== modified file 'mixxx/res/skins/Shade1024x600-Netbook/skin.xml'
--- mixxx/res/skins/Shade1024x600-Netbook/skin.xml	2013-05-11 22:59:25 +0000
+++ mixxx/res/skins/Shade1024x600-Netbook/skin.xml	2013-05-16 01:44:29 +0000
@@ -4133,13 +4133,11 @@
 									<ConfigKey>[Channel1],beatloop_0.125_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_0.125_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_0.125_enabled</ConfigKey>
@@ -4167,13 +4165,11 @@
 									<ConfigKey>[Channel1],beatloop_0.25_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_0.25_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_0.25_enabled</ConfigKey>
@@ -4201,13 +4197,11 @@
 									<ConfigKey>[Channel1],beatloop_0.5_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_0.5_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_0.5_enabled</ConfigKey>
@@ -4235,13 +4229,11 @@
 									<ConfigKey>[Channel1],beatloop_1_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_1_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_1_enabled</ConfigKey>
@@ -4269,13 +4261,11 @@
 									<ConfigKey>[Channel1],beatloop_2_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_2_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_2_enabled</ConfigKey>
@@ -4303,13 +4293,11 @@
 									<ConfigKey>[Channel1],beatloop_4_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_4_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_4_enabled</ConfigKey>
@@ -4337,13 +4325,11 @@
 									<ConfigKey>[Channel1],beatloop_8_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_8_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_8_enabled</ConfigKey>
@@ -4371,13 +4357,11 @@
 									<ConfigKey>[Channel1],beatloop_16_toggle</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>LeftButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatlooproll_16_activate</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
 								</Connection>
 								<Connection>
 									<ConfigKey>[Channel1],beatloop_16_enabled</ConfigKey>

=== removed file 'mixxx/src/analyserbpm.cpp'
--- mixxx/src/analyserbpm.cpp	2013-01-30 05:31:23 +0000
+++ mixxx/src/analyserbpm.cpp	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-#include <QtDebug>
-
-#undef TRUE
-#undef FALSE
-#include "BPMDetect.h"
-
-#include "trackinfoobject.h"
-#include "track/beatgrid.h"
-#include "track/beatfactory.h"
-#include "track/beatutils.h"
-#include "analyserbpm.h"
-
-AnalyserBPM::AnalyserBPM(ConfigObject<ConfigValue> *_config) :
-    m_pConfig(_config),
-    m_pDetector(NULL),
-    m_iMinBpm(0),
-    m_iMaxBpm(0),
-    m_bProcessEntireSong(true) {
-}
-
-bool AnalyserBPM::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
-    Q_UNUSED(totalSamples);
-    if (loadStored(tio)) {
-        return false;
-    }
-
-    m_iMinBpm = m_pConfig->getValueString(ConfigKey("[BPM]","BPMRangeStart")).toInt();
-    m_iMaxBpm = m_pConfig->getValueString(ConfigKey("[BPM]","BPMRangeEnd")).toInt();
-    m_bProcessEntireSong = (bool)m_pConfig->getValueString(ConfigKey("[BPM]","AnalyzeEntireSong")).toInt();
-
-    // All SoundSource's return stereo data, no matter the real file's type
-    m_pDetector = new soundtouch::BPMDetect(2, sampleRate);
-    //m_pDetector = new BPMDetect(tio->getChannels(), sampleRate);
-    //                                    defaultrange ? MIN_BPM : m_iMinBpm,
-    //                                    defaultrange ? MAX_BPM : m_iMaxBpm);
-    return true;
-}
-
-bool AnalyserBPM::loadStored(TrackPointer tio) const {
-    bool bpmEnabled = (bool)m_pConfig->getValueString(ConfigKey("[BPM]","BPMDetectionEnabled")).toInt();
-    // If BPM detection is enabled and the track does not have a BPM already,
-    // create a detector.
-    if(bpmEnabled && tio->getBpm() <= 0.0) {
-        return false;
-    }
-    return true;
-}
-
-void AnalyserBPM::process(const CSAMPLE *pIn, const int iLen) {
-    // Check if BPM detection is enabled
-    if(m_pDetector == NULL) {
-        return;
-    }
-    //qDebug() << "AnalyserBPM::process() processing " << iLen << " samples";
-
-    m_pDetector->inputSamples(pIn, iLen/2);
-}
-
-void AnalyserBPM::cleanup(TrackPointer tio)
-{
-    Q_UNUSED(tio);
-    if(m_pDetector != NULL)
-    {
-        delete m_pDetector;
-        m_pDetector = NULL;
-    }
-}
-
-void AnalyserBPM::finalise(TrackPointer tio) {
-    // Check if BPM detection is enabled
-    if(m_pDetector == NULL) {
-        return;
-    }
-
-    double bpm = m_pDetector->getBpm();
-    if (bpm != 0) {
-        // Shift it by 2's until it is in the desired range
-        double newbpm = BeatUtils::constrainBpm(
-            bpm, m_iMinBpm, m_iMaxBpm,
-            static_cast<bool>(m_pConfig->getValueString(
-                ConfigKey("[BPM]", "BPMAboveRangeEnabled")).toInt()));
-
-        // Currently, the BPM is only analyzed if the track has no BPM. This
-        // means we don't have to worry that the track already has an existing
-        // BeatGrid.
-        BeatsPointer pBeats = BeatFactory::makeBeatGrid(tio.data(), newbpm, 0.0f);
-        tio->setBeats(pBeats);
-
-        //if(pBpmReceiver) {
-        //pBpmReceiver->setComplete(tio, false, bpm);
-        //}
-        //qDebug() << "AnalyserBPM BPM detection successful for" << tio->getFilename();
-        //qDebug() << "AnalyserBPM BPM is " << newbpm << " (raw: " << bpm << ")";
-    } else {
-        //qDebug() << "AnalyserBPM BPM detection failed, setting to 0.";
-    }
-
-    // Cleanup the BPM detector
-    delete m_pDetector;
-    m_pDetector = NULL;
-
-}

=== removed file 'mixxx/src/analyserbpm.h'
--- mixxx/src/analyserbpm.h	2012-12-13 23:22:57 +0000
+++ mixxx/src/analyserbpm.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#ifndef ANALYSER_BPM_H
-#define ANALYSER_BPM_H
-
-#include "analyser.h"
-#include "configobject.h"
-
-namespace soundtouch {
-class BPMDetect;
-}
-
-class AnalyserBPM : public Analyser {
-  public:
-    AnalyserBPM(ConfigObject<ConfigValue> *_config);
-    bool initialise(TrackPointer tio, int sampleRate, int totalSamples);
-    bool loadStored(TrackPointer tio) const;
-    void process(const CSAMPLE *pIn, const int iLen);
-    void cleanup(TrackPointer tio);
-    void finalise(TrackPointer tio);
-
-  private:
-    ConfigObject<ConfigValue> *m_pConfig;
-    soundtouch::BPMDetect *m_pDetector;
-    int m_iMinBpm, m_iMaxBpm;
-    bool m_bProcessEntireSong;
-};
-
-#endif

=== modified file 'mixxx/src/analyserqueue.cpp'
--- mixxx/src/analyserqueue.cpp	2013-02-28 20:30:15 +0000
+++ mixxx/src/analyserqueue.cpp	2013-05-16 01:44:29 +0000
@@ -14,12 +14,9 @@
 #endif
 
 #include "analyserwaveform.h"
-#include "analyserbpm.h"
 #include "analyserrg.h"
-#ifdef __VAMP__
 #include "analyserbeats.h"
 #include "vamp/vampanalyser.h"
-#endif
 
 #include <typeinfo>
 
@@ -407,13 +404,9 @@
 
     ret->addAnalyser(new AnalyserWaveform(_config));
     ret->addAnalyser(new AnalyserGain(_config));
-#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(_config));
     //ret->addAnalyser(new AnalyserVampKeyTest(_config));
-#else
-    ret->addAnalyser(new AnalyserBPM(_config));
-#endif
 
     ret->start(QThread::IdlePriority);
     return ret;
@@ -426,13 +419,9 @@
 
     ret->addAnalyser(new AnalyserWaveform(_config));
     ret->addAnalyser(new AnalyserGain(_config));
-#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(_config));
     //ret->addAnalyser(new AnalyserVampKeyTest(_config));
-#else
-    ret->addAnalyser(new AnalyserBPM(_config));
-#endif
 
     ret->start(QThread::IdlePriority);
     return ret;

=== added directory 'mixxx/src/control'
=== added file 'mixxx/src/control/control.cpp'
--- mixxx/src/control/control.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/control/control.cpp	2013-05-16 01:44:29 +0000
@@ -0,0 +1,132 @@
+#include <QtDebug>
+#include <QMutexLocker>
+
+#include "control/control.h"
+
+#include "util/stat.h"
+#include "util/timer.h"
+
+// Static member variable definition
+QHash<ConfigKey, ControlDoublePrivate*> ControlDoublePrivate::m_sqCOHash;
+QMutex ControlDoublePrivate::m_sqCOHashMutex;
+
+ControlDoublePrivate::ControlDoublePrivate()
+        : m_bIgnoreNops(true),
+          m_bTrack(false) {
+    m_defaultValue.setValue(0);
+    m_value.setValue(0);
+}
+
+ControlDoublePrivate::ControlDoublePrivate(ConfigKey key,
+                                             bool bIgnoreNops, bool bTrack)
+        : m_key(key),
+          m_bIgnoreNops(bIgnoreNops),
+          m_bTrack(bTrack),
+          m_trackKey("control " + m_key.group + "," + m_key.item),
+          m_trackType(Stat::UNSPECIFIED),
+          m_trackFlags(Stat::COUNT | Stat::SUM | Stat::AVERAGE |
+                       Stat::SAMPLE_VARIANCE | Stat::MIN | Stat::MAX) {
+    m_defaultValue.setValue(0);
+    m_value.setValue(0);
+
+    m_sqCOHashMutex.lock();
+    m_sqCOHash.insert(m_key, this);
+    m_sqCOHashMutex.unlock();
+
+    if (m_bTrack) {
+        // TODO(rryan): Make configurable.
+        Stat::track(m_trackKey, static_cast<Stat::StatType>(m_trackType),
+                    static_cast<Stat::ComputeFlags>(m_trackFlags),
+                    m_value.getValue());
+    }
+}
+
+ControlDoublePrivate::~ControlDoublePrivate() {
+    m_sqCOHashMutex.lock();
+    m_sqCOHash.remove(m_key);
+    m_sqCOHashMutex.unlock();
+}
+
+// static
+ControlDoublePrivate* ControlDoublePrivate::getControl(
+    const ConfigKey& key, bool bCreate, bool bIgnoreNops, bool bTrack) {
+    QMutexLocker locker(&m_sqCOHashMutex);
+    QHash<ConfigKey, ControlDoublePrivate*>::const_iterator it = m_sqCOHash.find(key);
+    if (it != m_sqCOHash.end()) {
+        return it.value();
+    }
+    locker.unlock();
+
+    ControlDoublePrivate* pControl = NULL;
+    if (bCreate) {
+        pControl = new ControlDoublePrivate(key, bIgnoreNops, bTrack);
+        locker.relock();
+        m_sqCOHash.insert(key, pControl);
+        locker.unlock();
+    }
+
+    if (pControl == NULL) {
+        qWarning() << "ControlDoublePrivate::getControl returning NULL for ("
+                   << key.group << "," << key.item << ")";
+    }
+
+    return pControl;
+}
+
+double ControlDoublePrivate::get() const {
+    return m_value.getValue();
+}
+
+void ControlDoublePrivate::reset(QObject* pSender) {
+    double defaultValue = m_defaultValue.getValue();
+    set(defaultValue, pSender);
+}
+
+void ControlDoublePrivate::set(const double& value, QObject* pSender) {
+    if (m_bIgnoreNops && get() == value) {
+        return;
+    }
+
+    double dValue = value;
+    // The behavior says to ignore the set, ignore it.
+    ControlNumericBehavior* pBehavior = m_pBehavior;
+    if (pBehavior && !pBehavior->setFilter(&dValue)) {
+        return;
+    }
+    m_value.setValue(dValue);
+    emit(valueChanged(dValue, pSender));
+
+    if (m_bTrack) {
+        Stat::track(m_trackKey, static_cast<Stat::StatType>(m_trackType),
+                    static_cast<Stat::ComputeFlags>(m_trackFlags), dValue);
+    }
+}
+
+ControlNumericBehavior* ControlDoublePrivate::setBehavior(ControlNumericBehavior* pBehavior) {
+    return m_pBehavior.fetchAndStoreRelaxed(pBehavior);
+}
+
+void ControlDoublePrivate::setWidgetParameter(double dParam, QObject* pSetter) {
+    ControlNumericBehavior* pBehavior = m_pBehavior;
+    set(pBehavior ? pBehavior->widgetParameterToValue(dParam) : dParam, pSetter);
+}
+
+double ControlDoublePrivate::getWidgetParameter() const {
+    ControlNumericBehavior* pBehavior = m_pBehavior;
+    return pBehavior ? pBehavior->valueToWidgetParameter(get()) : get();
+}
+
+void ControlDoublePrivate::setMidiParameter(MidiOpCode opcode, double dParam) {
+    ControlNumericBehavior* pBehavior = m_pBehavior;
+    if (pBehavior) {
+        pBehavior->setValueFromMidiParameter(opcode, dParam, this);
+    } else {
+        set(dParam, NULL);
+    }
+}
+
+double ControlDoublePrivate::getMidiParameter() const {
+    ControlNumericBehavior* pBehavior = m_pBehavior;
+    return pBehavior ? pBehavior->valueToMidiParameter(get()) : get();
+}
+

=== added file 'mixxx/src/control/control.h'
--- mixxx/src/control/control.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/control/control.h	2013-05-16 01:44:29 +0000
@@ -0,0 +1,95 @@
+#ifndef CONTROL_H
+#define CONTROL_H
+
+#include <QHash>
+#include <QMutex>
+#include <QString>
+#include <QObject>
+#include <QAtomicPointer>
+
+#include "control/controlbehavior.h"
+#include "control/controlvalue.h"
+#include "configobject.h"
+
+class ControlDoublePrivate : public QObject {
+    Q_OBJECT
+  public:
+    ControlDoublePrivate();
+    ControlDoublePrivate(ConfigKey key, bool bIgnoreNops, bool bTrack);
+    virtual ~ControlDoublePrivate();
+
+    // Gets the ControlDoublePrivate matching the given ConfigKey. If bCreate
+    // is true, allocates a new ControlDoublePrivate for the ConfigKey if one
+    // does not exist.
+    static ControlDoublePrivate* getControl(
+        const ConfigKey& key,
+        bool bCreate, bool bIgnoreNops=true, bool bTrack=false);
+    static inline ControlDoublePrivate* getControl(
+        const QString& group, const QString& item,
+        bool bCreate, bool bIgnoreNops=true, bool bTrack=false) {
+        ConfigKey key(group, item);
+        return getControl(key, bCreate, bIgnoreNops, bTrack);
+    }
+
+    // Sets the control value.
+    void set(const double& value, QObject* pSetter);
+    // Gets the control value.
+    double get() const;
+    // Resets the control value to its default.
+    void reset(QObject* pSetter);
+
+    // Set the behavior to be used when setting values and translating between
+    // parameter and value space. Returns the previously set behavior (if any).
+    // Caller must handle appropriate destruction of the previous behavior or
+    // memory will leak.
+    ControlNumericBehavior* setBehavior(ControlNumericBehavior* pBehavior);
+
+    void setWidgetParameter(double dParam, QObject* pSetter);
+    double getWidgetParameter() const;
+
+    void setMidiParameter(MidiOpCode opcode, double dParam);
+    double getMidiParameter() const;
+
+    inline bool ignoreNops() const {
+        return m_bIgnoreNops;
+    }
+
+    inline void setDefaultValue(double dValue) {
+        m_defaultValue.setValue(dValue);
+    }
+    inline double defaultValue() const {
+        double default_value = m_defaultValue.getValue();
+        return m_pBehavior ? m_pBehavior->defaultValue(default_value) : default_value;
+    }
+
+  signals:
+    // Emitted when the ControlDoublePrivate value changes. pSetter is a
+    // pointer to the setter of the value (potentially NULL).
+    void valueChanged(double value, QObject* pSetter);
+
+  private:
+    ConfigKey m_key;
+    // Whether to ignore sets which would have no effect.
+    bool m_bIgnoreNops;
+
+    // Whether to track value changes with the stats framework.
+    bool m_bTrack;
+    QString m_trackKey;
+    int m_trackType;
+    int m_trackFlags;
+
+    // The control value.
+    ControlValueAtomic<double> m_value;
+    // The default control value.
+    ControlValueAtomic<double> m_defaultValue;
+
+    QAtomicPointer<ControlNumericBehavior> m_pBehavior;
+
+    // Hash of ControlDoublePrivate instantiations.
+    static QHash<ConfigKey,ControlDoublePrivate*> m_sqCOHash;
+    // Mutex guarding access to the ControlDoublePrivate hash.
+    static QMutex m_sqCOHashMutex;
+};
+
+
+#endif /* CONTROL_H */

=== added file 'mixxx/src/control/controlbehavior.cpp'
--- mixxx/src/control/controlbehavior.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/control/controlbehavior.cpp	2013-05-16 01:44:29 +0000
@@ -0,0 +1,63 @@
+#include "control/controlbehavior.h"
+#include "control/control.h"
+
+// static
+const int ControlPushButtonBehavior::kPowerWindowTimeMillis = 300;
+
+void ControlNumericBehavior::setValueFromMidiParameter(MidiOpCode o, double dParam,
+                                                       ControlDoublePrivate* pControl) {
+    Q_UNUSED(o);
+    pControl->set(dParam, NULL);
+}
+
+void ControlPotmeterBehavior::setValueFromMidiParameter(MidiOpCode o, double dParam,
+                                                        ControlDoublePrivate* pControl) {
+    Q_UNUSED(o);
+    pControl->set(widgetParameterToValue(dParam), NULL);
+}
+
+void ControlPushButtonBehavior::setValueFromMidiParameter(
+    MidiOpCode o, double dParam, ControlDoublePrivate* pControl) {
+    // This block makes push-buttons act as power window buttons.
+    if (m_buttonMode == POWERWINDOW && m_iNumStates == 2) {
+        if (o == MIDI_NOTE_ON) {
+            if (dParam > 0.) {
+                double value = pControl->get();
+                pControl->set(!value, NULL);
+                m_pushTimer.setSingleShot(true);
+                m_pushTimer.start(kPowerWindowTimeMillis);
+            }
+        } else if (o == MIDI_NOTE_OFF) {
+            if (!m_pushTimer.isActive()) {
+                pControl->set(0.0, NULL);
+            }
+        }
+    } else if (m_buttonMode == TOGGLE) {
+        // This block makes push-buttons act as toggle buttons.
+        if (m_iNumStates > 2) { //multistate button
+            if (dParam > 0.) { //looking for NOTE_ON doesn't seem to work...
+                double value = pControl->get();
+                value++;
+                if (value >= m_iNumStates) {
+                    pControl->set(0, NULL);
+                } else {
+                    pControl->set(value, NULL);
+                }
+            }
+        } else {
+            if (o == MIDI_NOTE_ON) {
+                if (dParam > 0.) {
+                    double value = pControl->get();
+                    pControl->set(!value, NULL);
+                }
+            }
+        }
+    } else { //Not a toggle button (trigger only when button pushed)
+        if (o == MIDI_NOTE_ON) {
+            double value = pControl->get();
+            pControl->set(!value, NULL);
+        } else if (o == MIDI_NOTE_OFF) {
+            pControl->set(0.0, NULL);
+        }
+    }
+}

=== added file 'mixxx/src/control/controlbehavior.h'
--- mixxx/src/control/controlbehavior.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/control/controlbehavior.h	2013-05-16 01:44:29 +0000
@@ -0,0 +1,186 @@
+#ifndef CONTROLBEHAVIOR_H
+#define CONTROLBEHAVIOR_H
+
+#include <math.h>
+
+#include <QTimer>
+
+#include "controllers/midi/midimessage.h"
+#include "mathstuff.h"
+
+class ControlDoublePrivate;
+
+class ControlNumericBehavior {
+  public:
+    // Returns true if the set should occur. Mutates dValue if the value should
+    // be changed.
+    virtual bool setFilter(double* dValue) {
+        Q_UNUSED(dValue);
+        return true;
+    }
+
+    virtual double defaultValue(double dDefault) const {
+        return dDefault;
+    }
+
+    virtual double valueToWidgetParameter(double dValue) {
+        return dValue;
+    }
+
+    virtual double widgetParameterToValue(double dParam) {
+        return dParam;
+    }
+
+    virtual double valueToMidiParameter(double dValue) {
+        return dValue;
+    }
+
+    virtual void setValueFromMidiParameter(MidiOpCode o, double dParam,
+                                           ControlDoublePrivate* pControl);
+};
+
+class ControlPotmeterBehavior : public ControlNumericBehavior {
+  public:
+    ControlPotmeterBehavior(double dMinValue, double dMaxValue)
+            : m_dMinValue(dMinValue),
+              m_dMaxValue(dMaxValue),
+              m_dValueRange(m_dMaxValue - m_dMinValue),
+              m_dDefaultValue(m_dMinValue + 0.5 * m_dValueRange) {
+    }
+
+    virtual bool setFilter(double* dValue) {
+        if (*dValue > m_dMaxValue) {
+            *dValue = m_dMaxValue;
+        } else if (*dValue < m_dMinValue) {
+            *dValue = m_dMinValue;
+        }
+        return true;
+    }
+
+    virtual double defaultValue(double dDefault) const {
+        Q_UNUSED(dDefault);
+        return m_dDefaultValue;
+    }
+
+    virtual double valueToWidgetParameter(double dValue) {
+        double dNorm = (dValue - m_dMinValue) / m_dValueRange;
+        return dNorm < 0.5 ? dNorm * 128.0 : dNorm * 126.0 + 1.0;
+    }
+
+    virtual double widgetParameterToValue(double dParam) {
+        double dNorm = dParam < 64 ? dParam / 128.0 : (dParam - 1.0) / 126.0;
+        return m_dMinValue + dNorm * m_dValueRange;
+    }
+
+    virtual double valueToMidiParameter(double dValue) {
+        return valueToWidgetParameter(dValue);
+    }
+
+    virtual void setValueFromMidiParameter(MidiOpCode o, double dParam,
+                                           ControlDoublePrivate* pControl);
+
+  protected:
+    double m_dMinValue;
+    double m_dMaxValue;
+    double m_dValueRange;
+    double m_dDefaultValue;
+};
+
+#define maxPosition 127
+#define minPosition 0
+#define middlePosition ((maxPosition-minPosition)/2)
+#define positionrange (maxPosition-minPosition)
+
+class ControlLogpotmeterBehavior : public ControlPotmeterBehavior {
+  public:
+    ControlLogpotmeterBehavior(double dMaxValue) : ControlPotmeterBehavior(0, dMaxValue) {
+        m_dB1 = log10(2.0) / middlePosition;
+        m_dB2 = log10(dMaxValue) / (maxPosition - middlePosition);
+    }
+
+    virtual double defaultValue(double dDefault) {
+        Q_UNUSED(dDefault);
+        return 1.0;
+    }
+
+    virtual double valueToWidgetParameter(double dValue) {
+        if (dValue > 1.0) {
+            return log10(dValue) / m_dB2 + middlePosition;
+        } else {
+            return log10(dValue + 1.0) / m_dB1;
+        }
+    }
+
+    virtual double widgetParameterToValue(double dParam) {
+        if (dParam <= middlePosition) {
+            return pow(10.0, m_dB1 * dParam) - 1;
+        } else {
+            return pow(10.0, m_dB2 * (dParam - middlePosition));
+        }
+    }
+
+  protected:
+    double m_dB1, m_dB2;
+};
+
+class ControlLinPotmeterBehavior : public ControlPotmeterBehavior {
+  public:
+    ControlLinPotmeterBehavior(double dMinValue, double dMaxValue)
+            : ControlPotmeterBehavior(dMinValue, dMaxValue) {
+    }
+
+    virtual double valueToWidgetParameter(double dValue) {
+        double dNorm = (dValue - m_dMinValue) / m_dValueRange;
+        return math_min(dNorm * 128, 127);
+    }
+
+    virtual double widgetParameterToValue(double dParam) {
+        double dNorm = dParam / 128.0;
+        return m_dMinValue + dNorm * m_dValueRange;
+    }
+};
+
+class ControlTTRotaryBehavior : public ControlNumericBehavior {
+  public:
+    virtual double valueToWidgetParameter(double dValue) {
+        return dValue * 200.0 + 64;
+    }
+
+    virtual double widgetParameterToValue(double dParam) {
+        // Non-linear scaling
+        double temp = ((dParam - 64.0) * (dParam - 64.0)) / 64.0;
+        if (dParam - 64 < 0) {
+            temp = -temp;
+        }
+        return temp;
+    }
+};
+
+class ControlPushButtonBehavior : public ControlNumericBehavior {
+  public:
+    static const int kPowerWindowTimeMillis;
+
+    // TODO(XXX) Duplicated from ControlPushButton. It's complicated and
+    // annoying to share them so I just copied them.
+    enum ButtonMode {
+         PUSH = 0,
+         TOGGLE,
+         POWERWINDOW
+    };
+
+    ControlPushButtonBehavior(ButtonMode buttonMode,
+                              int iNumStates)
+            : m_buttonMode(buttonMode),
+              m_iNumStates(iNumStates) {
+    }
+
+    virtual void setValueFromMidiParameter(MidiOpCode o, double dParam,
+                                           ControlDoublePrivate* pControl);
+
+  private:
+    ButtonMode m_buttonMode;
+    int m_iNumStates;
+    QTimer m_pushTimer;
+};
+
+#endif /* CONTROLBEHAVIOR_H */

=== renamed file 'mixxx/src/controlobjectbase.h' => 'mixxx/src/control/controlvalue.h'
--- mixxx/src/controlobjectbase.h	2013-05-15 20:33:26 +0000
+++ mixxx/src/control/controlvalue.h	2013-05-16 01:44:29 +0000
@@ -1,28 +1,34 @@
+#ifndef CONTROLVALUE_H
+#define CONTROLVALUE_H
 
-#ifndef CONTROLOBJECTBASE_H_
-#define CONTROLOBJECTBASE_H_
+#include <limits>
 
 #include <QAtomicInt>
 #include <QObject>
-#include <limits>
 
 // for look free access, this value has to be >= the number of value using threads
 // value must be a fraction of an integer
 const int cRingSize = 8;
-// there are basicly unlimited readers allowed at each ring element 
+// there are basicly unlimited readers allowed at each ring element
 // but we have to count them so max() is just fine.
 const int cReaderSlotCnt = std::numeric_limits<int>::max();
 
-
+// A single instance of a value of type T along with an atomic integer which
+// tracks the current number of readers or writers of the slot. The value
+// m_readerSlots starts at cReaderSlotCnt and counts down to 0. If the value is
+// 0 or less then reads to the value fail because there are either too many
+// readers or a write is occurring. A write to the value will fail if
+// m_readerSlots is not equal to cReaderSlotCnt (e.g. there is an active
+// reader).
 template<typename T>
-class ControlObjectRingValue {
+class ControlRingValue {
   public:
-    ControlObjectRingValue()
+    ControlRingValue()
         : m_value(T()),
           m_readerSlots(cReaderSlotCnt) {
     }
 
-    bool tryGet(T* value) {
+    bool tryGet(T* value) const {
         // Read while consuming one readerSlot
         bool hasSlot = (m_readerSlots.fetchAndAddAcquire(-1) > 0);
         if (hasSlot) {
@@ -44,14 +50,19 @@
 
   private:
     T m_value;
-    QAtomicInt m_readerSlots;
+    mutable QAtomicInt m_readerSlots;
 };
 
 // Ring buffer based implementation for all Types sizeof(T) > sizeof(void*)
+
+// An implementation of ControlValueAtomicBase for non-atomic types T. Uses a
+// ring-buffer of ControlRingValues and a read pointer and write pointer to
+// provide getValue()/setValue() methods which *sacrifice perfect consistency*
+// for the benefit of wait-free read/write access to a value.
 template<typename T, bool ATOMIC = false>
-class ControlObjectValue {
+class ControlValueAtomicBase {
   public:
-    inline T getValue() {
+    inline T getValue() const {
         T value = T();
         unsigned int index = (unsigned int)m_readIndex
                 % (cRingSize);
@@ -59,10 +70,10 @@
             // We are here if
             // 1) there are more then cReaderSlotCnt reader (get) reading the same value or
             // 2) the formerly current value is locked by a writer
-            // Case 1 does not happen because we have enough (0x7fffffff) reader slots. 
+            // Case 1 does not happen because we have enough (0x7fffffff) reader slots.
             // Case 2 happens when the a reader is delayed after reading the
-            // m_currentIndex and in the mean while a reader locks the formaly current value 
-            // because it has written cRingSize times. Reading the less recent value will fix 
+            // m_currentIndex and in the mean while a reader locks the formaly current value
+            // because it has written cRingSize times. Reading the less recent value will fix
             // it because it is now actualy the current value.
             index = (index - 1) % (cRingSize);
         }
@@ -85,7 +96,7 @@
     }
 
   protected:
-    ControlObjectValue()
+    ControlValueAtomicBase()
         : m_readIndex(0),
           m_writeIndex(1) {
         Q_ASSERT((std::numeric_limits<unsigned int>::max() % cRingSize) == (cRingSize - 1));
@@ -94,16 +105,18 @@
   private:
     // In worst case, each reader can consume a reader slot from a different ring element.
     // In this case there is still one ring element available for writing.
-    ControlObjectRingValue<T> m_ring[cRingSize];
+    ControlRingValue<T> m_ring[cRingSize];
     QAtomicInt m_readIndex;
     QAtomicInt m_writeIndex;
 };
 
-// Specialized Template for atomic types.
+// Specialized template for types that are deemed to be atomic on the target
+// architecture. Instead of using a read/write ring to guarantee atomicity,
+// direct assignment/read of an aligned member variable is used.
 template<typename T>
-class ControlObjectValue<T, true> {
+class ControlValueAtomicBase<T, true> {
   public:
-    inline T getValue() {
+    inline T getValue() const {
         return m_value;
     }
 
@@ -112,8 +125,8 @@
     }
 
   protected:
-    ControlObjectValue()
-        : m_value(T()) {
+    ControlValueAtomicBase()
+            : m_value(T()) {
     }
 
   private:
@@ -126,20 +139,19 @@
 #endif
 };
 
-// This is a proxy Template to select the native atomic or the ring buffer
-// Implementation depending on the target architecture
-// Note: Qt does not support templates for signal and slots
-// So the typified ControlObject has to handle the Event Queue connections
+// ControlValueAtomic is a wrapper around ControlValueAtomicBase which uses the
+// sizeof(T) to determine which underlying implementation of
+// ControlValueAtomicBase to use. For types where sizeof(T) <= sizeof(void*),
+// the specialized implementation of ControlValueAtomicBase for types that are
+// atomic on the architecture is used.
 template<typename T>
-class ControlObjectBase
-    : public ControlObjectValue<T, sizeof(T) <= sizeof(void*)> {
+class ControlValueAtomic
+    : public ControlValueAtomicBase<T, sizeof(T) <= sizeof(void*)> {
   public:
 
-    ControlObjectBase()
-        : ControlObjectValue<T, sizeof(T) <= sizeof(void*)>() {
+    ControlValueAtomic()
+        : ControlValueAtomicBase<T, sizeof(T) <= sizeof(void*)>() {
     }
 };
 
-
-#endif // CONTROLOBJECTBASE_H_
-
+#endif /* CONTROLVALUE_H */

=== removed file 'mixxx/src/controlbeat.cpp'
--- mixxx/src/controlbeat.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controlbeat.cpp	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/***************************************************************************
-                          controlbeat.cpp  -  description
-                             -------------------
-    begin                : Mon Apr 7 2003
-    copyright            : (C) 2003 by Tue & Ken Haste Andersen
-    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 "controlbeat.h"
-
-ControlBeat::ControlBeat(ConfigKey key, bool bMidiSimulateLatching)
-    : ControlObject(key),
-      m_bMidiSimulateLatching(bMidiSimulateLatching),
-      m_bPressed(false),
-      m_iValidPresses(0) {
-
-    time.start();
-    // Filter buffer
-    buffer = new CSAMPLE[filterLength];
-    for (int i = 0; i < filterLength; i++) {
-        buffer[i] = 0.;
-    }
-}
-
-ControlBeat::~ControlBeat()
-{
-    delete [] buffer;
-}
-
-void ControlBeat::setValueFromMidi(MidiOpCode o, double v)
-{
-    Q_UNUSED(o);
-    Q_UNUSED(v);
-    if (!m_bPressed || !m_bMidiSimulateLatching)
-    {
-        beatTap();
-        m_bPressed = true;
-    }
-    else
-        m_bPressed = false;
-}
-
-void ControlBeat::setValueFromThread(double dValue) {
-    if (dValue > 0) {
-        beatTap();
-    }
-}
-
-void ControlBeat::beatTap()
-{
-    int elapsed = time.restart();
-
-    if (elapsed <= maxInterval) {
-        // Move back in filter one sample
-        for (int i = filterLength-1; i > 0; i--)
-            buffer[i] = buffer[i-1];
-
-        buffer[0] = 1000.*(60./elapsed);
-        if (buffer[0] > maxBPM)
-            buffer[0] = maxBPM;
-
-        m_iValidPresses++;
-        if (m_iValidPresses > filterLength)
-            m_iValidPresses = filterLength;
-
-        double temp = 0.;
-        for (int i = 0; i < m_iValidPresses; ++i)
-            temp += buffer[i];
-        temp /= m_iValidPresses;
-        set(temp);
-    } else {
-        m_iValidPresses = 0;
-    }
-}

=== removed file 'mixxx/src/controlbeat.h'
--- mixxx/src/controlbeat.h	2012-03-17 17:42:44 +0000
+++ mixxx/src/controlbeat.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/***************************************************************************
-                          controlbeat.h  -  description
-                             -------------------
-    begin                : Mon Apr 7 2003
-    copyright            : (C) 2003 by Tue & Ken Haste Andersen
-    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 CONTROLBEAT_H
-#define CONTROLBEAT_H
-
-#include "controlobject.h"
-#include "configobject.h"
-#include "defs.h"
-#include <qdatetime.h>
-
-/**
-  * Takes impulses as input, and convert it to a BPM measure.
-  *
-  *@author Tue & Ken Haste Andersen
-  */
-
-/** Minimum allowed Beat per minute (BPM) */
-const int minBPM = 30;
-/** Maximum allowed bpm */
-const int maxBPM = 240;
-/** Maximum allowed interval between beats in milli seconds (calculated from minBPM) */
-const int maxInterval = (int)(1000.*(60./(CSAMPLE)minBPM));
-/** Filter length */
-const int filterLength = 5;
-
-class ControlBeat : public ControlObject {
-  public:
-    ControlBeat(ConfigKey key, bool bMidiSimulateLatching=false);
-    virtual ~ControlBeat();
-
-  protected:
-    void setValueFromMidi(MidiOpCode o, double v);
-    void setValueFromThread(double dValue);
-  private:
-    void beatTap();
-
-    QTime time;
-    CSAMPLE *buffer;
-    bool m_bMidiSimulateLatching;
-    bool m_bPressed;
-    int m_iValidPresses;
-};
-
-#endif

=== modified file 'mixxx/src/controllers/controllerengine.cpp'
--- mixxx/src/controllers/controllerengine.cpp	2013-05-01 21:53:11 +0000
+++ mixxx/src/controllers/controllerengine.cpp	2013-05-16 01:44:29 +0000
@@ -640,8 +640,11 @@
 
     ControlObjectThread *cot = getControlObjectThread(group, name);
 
-    if (cot != NULL && !m_st.ignore(cot->getControlObject(), newValue)) {
-        cot->slotSet(newValue);
+    if (cot != NULL) {
+        ControlObject* pControl = ControlObject::getControl(cot->getKey());
+        if (pControl && !m_st.ignore(pControl, newValue)) {
+            cot->slotSet(newValue);
+        }
     }
 }
 
@@ -812,12 +815,7 @@
         return;
     }
 
-    ControlObject* pSenderCO = senderCOT->getControlObject();
-    if (pSenderCO == NULL) {
-        qWarning() << "ControllerEngine::slotValueChanged() The sender's CO is NULL.";
-        return;
-    }
-    ConfigKey key = pSenderCO->getKey();
+    ConfigKey key = senderCOT->getKey();
 
     //qDebug() << "[Controller]: SlotValueChanged" << key.group << key.item;
 

=== modified file 'mixxx/src/controllers/midi/midicontroller.cpp'
--- mixxx/src/controllers/midi/midicontroller.cpp	2013-05-01 21:53:11 +0000
+++ mixxx/src/controllers/midi/midicontroller.cpp	2013-05-16 01:44:29 +0000
@@ -165,6 +165,58 @@
     }
 }
 
+QString formatMidiMessage(unsigned char status, unsigned char control, unsigned char value,
+                          unsigned char channel, unsigned char opCode) {
+    switch (opCode) {
+        case MIDI_PITCH_BEND:
+            return QString("MIDI status 0x%1: pitch bend ch %2, value 0x%3")
+                    .arg(QString::number(status, 16).toUpper(),
+                         QString::number(channel+1, 10),
+                         QString::number((value << 7) | control, 16).toUpper().rightJustified(4,'0'));
+        case MIDI_SONG_POS:
+            return QString("MIDI status 0x%1: song position 0x%2")
+                    .arg(QString::number(status, 16).toUpper(),
+                         QString::number((value << 7) | control, 16).toUpper().rightJustified(4,'0'));
+        case MIDI_PROGRAM_CH:
+        case MIDI_CH_AFTERTOUCH:
+            return QString("MIDI status 0x%1 (ch %2, opcode 0x%3), value 0x%4")
+                    .arg(QString::number(status, 16).toUpper(),
+                         QString::number(channel+1, 10),
+                         QString::number((status & 255)>>4, 16).toUpper(),
+                         QString::number(control, 16).toUpper().rightJustified(2,'0'));
+        case MIDI_SONG:
+            return QString("MIDI status 0x%1: select song #%2")
+                    .arg(QString::number(status, 16).toUpper(),
+                         QString::number(control+1, 10));
+        case MIDI_NOTE_OFF:
+        case MIDI_NOTE_ON:
+        case MIDI_AFTERTOUCH:
+        case MIDI_CC:
+            return QString("MIDI status 0x%1 (ch %2, opcode 0x%3), ctrl 0x%4, val 0x%5")
+                    .arg(QString::number(status, 16).toUpper(),
+                         QString::number(channel+1, 10),
+                         QString::number((status & 255)>>4, 16).toUpper(),
+                         QString::number(control, 16).toUpper().rightJustified(2,'0'),
+                         QString::number(value, 16).toUpper().rightJustified(2,'0'));
+        default:
+            return QString("MIDI status 0x%1")
+                    .arg(QString::number(status, 16).toUpper());
+    }
+}
+
+bool isMessageTwoBytes(unsigned char opCode) {
+    switch (opCode) {
+        case MIDI_SONG:
+        case MIDI_NOTE_OFF:
+        case MIDI_NOTE_ON:
+        case MIDI_AFTERTOUCH:
+        case MIDI_CC:
+            return true;
+        default:
+            return false;
+    }
+}
+
 void MidiController::receive(unsigned char status, unsigned char control,
                              unsigned char value) {
     unsigned char channel = status & 0x0F;
@@ -173,57 +225,10 @@
         opCode = status;
     }
 
-    QString message;
-    bool twoBytes = true;
-
-    switch (opCode) {
-        case MIDI_PITCH_BEND:
-            twoBytes = false;
-            message = QString("MIDI status 0x%1: pitch bend ch %2, value 0x%3")
-                 .arg(QString::number(status, 16).toUpper(),
-                      QString::number(channel+1, 10),
-                      QString::number((value << 7) | control, 16).toUpper().rightJustified(4,'0'));
-            break;
-        case MIDI_SONG_POS:
-            twoBytes = false;
-            message = QString("MIDI status 0x%1: song position 0x%2")
-                 .arg(QString::number(status, 16).toUpper(),
-                      QString::number((value << 7) | control, 16).toUpper().rightJustified(4,'0'));
-            break;
-        case MIDI_PROGRAM_CH:
-        case MIDI_CH_AFTERTOUCH:
-            twoBytes = false;
-            message = QString("MIDI status 0x%1 (ch %2, opcode 0x%3), value 0x%4")
-                 .arg(QString::number(status, 16).toUpper(),
-                      QString::number(channel+1, 10),
-                      QString::number((status & 255)>>4, 16).toUpper(),
-                      QString::number(control, 16).toUpper().rightJustified(2,'0'));
-            break;
-        case MIDI_SONG:
-            message = QString("MIDI status 0x%1: select song #%2")
-                 .arg(QString::number(status, 16).toUpper(),
-                      QString::number(control+1, 10));
-            break;
-        case MIDI_NOTE_OFF:
-        case MIDI_NOTE_ON:
-        case MIDI_AFTERTOUCH:
-        case MIDI_CC:
-            message = QString("MIDI status 0x%1 (ch %2, opcode 0x%3), ctrl 0x%4, val 0x%5")
-                 .arg(QString::number(status, 16).toUpper(),
-                      QString::number(channel+1, 10),
-                      QString::number((status & 255)>>4, 16).toUpper(),
-                      QString::number(control, 16).toUpper().rightJustified(2,'0'),
-                      QString::number(value, 16).toUpper().rightJustified(2,'0'));
-            break;
-        default:
-            twoBytes = false;
-            message = QString("MIDI status 0x%1")
-                 .arg(QString::number(status, 16).toUpper());
-            break;
-    }
+    bool twoBytes = isMessageTwoBytes(opCode);
 
     if (debugging()) {
-        qDebug() << message;
+        qDebug() << formatMidiMessage(status, control, value, channel, opCode);
     }
 
     //if (m_bReceiveInhibit) return;
@@ -265,16 +270,12 @@
             //Reset the saved control.
             setControlToLearn(MixxxControl());
 
-            QString message = "error";
-            if (twoBytes) {
-                message = QString("0x%1 0x%2")
-                            .arg(QString::number(mappingKey.status, 16).toUpper(),
-                                QString::number(mappingKey.control, 16).toUpper()
-                                    .rightJustified(2,'0'));
-            } else {
-                message = QString("0x%1")
-                            .arg(QString::number(mappingKey.status, 16).toUpper());
-            }
+            QString message = twoBytes ? QString("0x%1 0x%2")
+                    .arg(QString::number(mappingKey.status, 16).toUpper(),
+                         QString::number(mappingKey.control, 16).toUpper()
+                         .rightJustified(2,'0')) :
+                    QString("0x%1")
+                    .arg(QString::number(mappingKey.status, 16).toUpper());
             emit(learnedMessage(message));
         }
     }
@@ -333,7 +334,7 @@
 
         // computeValue not (yet) done on pitch messages because it all assumes 7-bit numbers
     } else {
-        double currMixxxControlValue = p->GetMidiValue();
+        double currMixxxControlValue = p->getValueToMidi();
         newValue = computeValue(options, currMixxxControlValue, value);
     }
 
@@ -355,7 +356,7 @@
                 return;
             }
         }
-        p->setValueFromThread(newValue);
+        p->setValueFromThread(newValue, NULL);
     } else {
         if (options.soft_takeover) {
             if (m_st.ignore(p, newValue, true)) {
@@ -456,17 +457,20 @@
     return _newmidivalue;
 }
 
-void MidiController::receive(QByteArray data) {
-    int length = data.size();
-    QString message = QString("%1: %2 bytes: [").arg(getName()).arg(length);
-    for (int i = 0; i < length; ++i) {
+QString formatSysexMessage(QString controllerName, const QByteArray& data) {
+    QString message = QString("%1: %2 bytes: [").arg(controllerName).arg(data.size());
+    for (int i = 0; i < data.size(); ++i) {
         message += QString("%1%2").arg(
             QString("%1").arg((unsigned char)(data.at(i)), 2, 16, QChar('0')).toUpper(),
-            QString("%1").arg((i < (length-1)) ? ' ' : ']'));
+            QString("%1").arg((i < (data.size()-1)) ? ' ' : ']'));
     }
+    return message;
+}
 
-    if (debugging())
-        qDebug() << message;
+void MidiController::receive(QByteArray data) {
+    if (debugging()) {
+        qDebug() << formatSysexMessage(getName(), data);
+    }
 
     //if (m_bReceiveInhibit) return;
 
@@ -494,7 +498,7 @@
             setControlToLearn(MixxxControl());
 
             QString message = QString("0x%1")
-                        .arg(QString::number(mappingKey.status, 16).toUpper());
+                    .arg(QString::number(mappingKey.status, 16).toUpper());
             emit(learnedMessage(message));
         }
         // Don't process MIDI messages when learning
@@ -523,7 +527,8 @@
         }
         return;
     }
-    qWarning() << "MidiController: No script function specified for" << message;
+    qWarning() << "MidiController: No script function specified for"
+               << formatSysexMessage(getName(), data);
 }
 
 void MidiController::sendShortMsg(unsigned char status, unsigned char byte1, unsigned char byte2) {

=== modified file 'mixxx/src/controllers/midi/midioutputhandler.cpp'
--- mixxx/src/controllers/midi/midioutputhandler.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controllers/midi/midioutputhandler.cpp	2013-05-16 01:44:29 +0000
@@ -6,10 +6,11 @@
  *
  */
 
+#include <QtDebug>
+
 #include "controllers/midi/midioutputhandler.h"
 #include "controllers/midi/midicontroller.h"
-
-#include <QDebug>
+#include "controlobject.h"
 
 MidiOutputHandler::MidiOutputHandler(QString group, QString key,
                                      MidiController *controller,
@@ -25,32 +26,24 @@
           m_on(on),
           m_off(off),
           m_lastVal(0) {
+    connect(&m_cobj, SIGNAL(valueChanged(double)),
+            this, SLOT(controlChanged(double)));
 }
 
 MidiOutputHandler::~MidiOutputHandler() {
-    if (m_cobj != NULL) {
-        ConfigKey cKey = m_cobj->getKey();
-        if (m_pController->debugging()) {
-            qDebug() << QString("Destroying static MIDI output handler on %1 for %2,%3")
-                    .arg(m_pController->getName(), cKey.group, cKey.item);
-        }
+    ConfigKey cKey = m_cobj.getKey();
+    if (m_pController->debugging()) {
+        qDebug() << QString("Destroying static MIDI output handler on %1 for %2,%3")
+                .arg(m_pController->getName(), cKey.group, cKey.item);
     }
 }
 
 bool MidiOutputHandler::validate() {
-    if (m_cobj == NULL) {
-        return false;
-    }
-    connect(m_cobj, SIGNAL(valueChanged(double)),
-            this, SLOT(controlChanged(double)));
-    return true;
+    return m_cobj.valid();
 }
 
 void MidiOutputHandler::update() {
-    if (m_cobj == NULL) {
-        return;
-    }
-    controlChanged(m_cobj->get());
+    controlChanged(m_cobj.get());
 }
 
 void MidiOutputHandler::controlChanged(double value) {

=== modified file 'mixxx/src/controllers/midi/midioutputhandler.h'
--- mixxx/src/controllers/midi/midioutputhandler.h	2012-04-24 05:51:32 +0000
+++ mixxx/src/controllers/midi/midioutputhandler.h	2013-05-16 01:44:29 +0000
@@ -11,7 +11,7 @@
 #ifndef MIDIOUTPUTHANDLER_H
 #define MIDIOUTPUTHANDLER_H
 
-#include "controlobject.h"
+#include "controlobjectthread.h"
 
 class MidiController;   // forward declaration
 
@@ -32,7 +32,7 @@
 
   private:
     MidiController* m_pController;
-    ControlObject* m_cobj;
+    ControlObjectThread m_cobj;
     float m_min;
     float m_max;
     unsigned char m_status;

=== modified file 'mixxx/src/controllers/softtakeover.cpp'
--- mixxx/src/controllers/softtakeover.cpp	2013-04-27 22:06:33 +0000
+++ mixxx/src/controllers/softtakeover.cpp	2013-05-16 01:44:29 +0000
@@ -79,7 +79,7 @@
             threshold = scaleFactor*(threshold/128.0f);
         }
 
-        double currentValue = midiVal ? control->GetMidiValue() : control->get();
+        double currentValue = midiVal ? control->getValueToMidi() : control->get();
         double difference = currentValue - newValue;
         double prevDiff = 0;
         bool sameSide = false;

=== modified file 'mixxx/src/controllinpotmeter.cpp'
--- mixxx/src/controllinpotmeter.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controllinpotmeter.cpp	2013-05-16 01:44:29 +0000
@@ -1,34 +1,15 @@
 #include "controllinpotmeter.h"
 #include "defs.h"
 
-
 // This control has a linear link between the m_dValue and the Midi Value
 // limitation: m_dMaxValue represents the midi value of 128 and is never reached
 ControlLinPotmeter::ControlLinPotmeter(ConfigKey key, double dMinValue, double dMaxValue) :
     ControlPotmeter(key, dMinValue, dMaxValue) {
-
-}
-
-double ControlLinPotmeter::getValueToWidget(double dValue) {
-    double out = (dValue - m_dMinValue) / m_dValueRange;
-    return math_min(out * 128, 127);
-}
-
-double ControlLinPotmeter::GetMidiValue() {
-    double out = get();
-    out = (out - m_dMinValue) / m_dValueRange;
-    return math_min(out * 128, 127);
-}
-
-double ControlLinPotmeter::getValueFromWidget(double dValue) {
-    double out = dValue / 128;
-    return m_dMinValue + out * m_dValueRange;
-}
-
-void ControlLinPotmeter::setValueFromMidi(MidiOpCode o, double v) {
-    Q_UNUSED(o);
-    double out = v / 128;
-    set(m_dMinValue + out * m_dValueRange);
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlLinPotmeterBehavior(dMinValue, dMaxValue));
+        delete pOldBehavior;
+    }
 }
 
 

=== modified file 'mixxx/src/controllinpotmeter.h'
--- mixxx/src/controllinpotmeter.h	2012-12-22 14:07:45 +0000
+++ mixxx/src/controllinpotmeter.h	2013-05-16 01:44:29 +0000
@@ -3,19 +3,10 @@
 
 #include "controlpotmeter.h"
 
-class ControlLinPotmeter : public ControlPotmeter
-{
+class ControlLinPotmeter : public ControlPotmeter {
     Q_OBJECT
   public:
-
     ControlLinPotmeter(ConfigKey key, double dMinValue=0.0, double dMaxValue=1.0);
-
-    double getValueToWidget(double dValue);
-    double GetMidiValue();
-    double getValueFromWidget(double dValue);
-
-  protected:
-    void setValueFromMidi(MidiOpCode o, double v);
 };
 
 #endif // CONTROLLINPOTMETER_H

=== modified file 'mixxx/src/controllogpotmeter.cpp'
--- mixxx/src/controllogpotmeter.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controllogpotmeter.cpp	2013-05-16 01:44:29 +0000
@@ -15,14 +15,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <math.h>
 #include "controllogpotmeter.h"
 
-#define maxPosition 127
-#define minPosition 0
-#define middlePosition ((maxPosition-minPosition)/2)
-#define positionrange (maxPosition-minPosition)
-
 /* -------- ------------------------------------------------------
    Purpose: Creates a new logarithmic potmeter, where the value is
             given by:
@@ -41,72 +35,13 @@
 ControlLogpotmeter::ControlLogpotmeter(ConfigKey key, double dMaxValue)
     : ControlPotmeter(key, 0, dMaxValue) {
     // Override ControlPotmeters default value of 0.5
-    m_dDefaultValue = 1.0;
-    set(m_dDefaultValue);
-
-    if (m_dMaxValue == 1.) {
-        m_bTwoState = false;
-        m_fB1 = log10(2.)/maxPosition;
-    } else {
-        m_bTwoState = true;
-        m_fB1 = log10(2.)/middlePosition;
-        m_fB2 = log10(dMaxValue)/(maxPosition-middlePosition);
-    }
-}
-
-double ControlLogpotmeter::getValueFromWidget(double dValue)
-{
-    double dResult = 0;
-
-    // Calculate the value linearly:
-    if (!m_bTwoState)
-    {
-        dResult = pow(10., (double)(m_fB1*dValue)) - 1;
-    }
-    else
-    {
-        if (dValue <= middlePosition)
-            dResult = pow(10., m_fB1*dValue) - 1;
-        else
-            dResult = pow(10., m_fB2*(dValue - middlePosition));
-    }
-
-    //qDebug() << "Midi: " << dValue << " ValueFromWidget : " << m_dValue;
-    return dResult;
-}
-
-double ControlLogpotmeter::getValueToWidget(double dValue)
-{
-    double pos;
-
-    if (!m_bTwoState)
-    {
-        pos = log10(dValue+1)/m_fB1;
-    }
-    else
-    {
-        if (dValue > 1.) {
-            pos = log10(dValue) / m_fB2 + middlePosition;
-        } else {
-            pos = log10(dValue+1) / m_fB1;
-        }
-    }
-    //qDebug() << "GetValueToWidget : " << pos;
-    return pos;
-}
-
-double ControlLogpotmeter::GetMidiValue()
-{
-    double midival = 0.;
-
-    midival = getValueToWidget(get());
-    //    midival = 127.*(midival-m_dMinValue)/m_dValueRange
-    //qDebug() << "GetMidiValue : " << midival;
-    return midival;
-}
-
-void ControlLogpotmeter::setValueFromMidi(MidiOpCode o, double v) {
-    Q_UNUSED(o);
-    set(getValueFromWidget(v));
+    setDefaultValue(1.0);
+    set(1.0);
+
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlLogpotmeterBehavior(dMaxValue));
+        delete pOldBehavior;
+    }
 }
 

=== modified file 'mixxx/src/controllogpotmeter.h'
--- mixxx/src/controllogpotmeter.h	2012-03-17 17:42:44 +0000
+++ mixxx/src/controllogpotmeter.h	2013-05-16 01:44:29 +0000
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 20 2002
     copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                : 
+    email                :
  ***************************************************************************/
 
 /***************************************************************************
@@ -26,28 +26,10 @@
  *@author Tue and Ken Haste Andersen
  */
 
-class ControlLogpotmeter : public ControlPotmeter
-{
+class ControlLogpotmeter : public ControlPotmeter {
     Q_OBJECT
-public:
+  public:
     ControlLogpotmeter(ConfigKey key, double dMaxValue=5.);
-    
-    double getValueFromWidget(double dValue);
-    double getValueToWidget(double dValue);
-
-    double GetMidiValue();
-    
-    void setValueFromMidi(MidiOpCode o, double v);
-
-protected:
-
-    // This is true, if the log potmeter is divided into two states, one from 0 to 1, and
-    // the second from 1 to m_dMaxValue. Two states is often used with knobs where the first
-    // half rotation is used to control a value between 0 and 1, and the second half between
-    // 1 and some bigger value.
-    bool m_bTwoState;
-    
-    double m_fB1, m_fB2;
 };
 
 #endif

=== removed file 'mixxx/src/controlnull.cpp'
--- mixxx/src/controlnull.cpp	2007-09-09 22:52:24 +0000
+++ mixxx/src/controlnull.cpp	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/***************************************************************************
-                          controlnull.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 15 2002
-    copyright            : (C) 2002 by Tue & Ken Haste Andersen
-    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 "controlnull.h"
-
-ControlNull::ControlNull() : ControlObject()
-{
-}
-
-ControlNull::~ControlNull()
-{
-}
-

=== removed file 'mixxx/src/controlnull.h'
--- mixxx/src/controlnull.h	2004-10-01 08:18:11 +0000
+++ mixxx/src/controlnull.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/***************************************************************************
-                          controlnull.h  -  description
-                             -------------------
-    begin                : Sat Jun 15 2002
-    copyright            : (C) 2002 by Tue & Ken Haste Andersen
-    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 CONTROLNULL_H
-#define CONTROLNULL_H
-
-#include "controlobject.h"
-
-/**
-  *@author Tue & Ken Haste Andersen
-  */
-
-class ControlNull : public ControlObject  {
-    Q_OBJECT
-public:
-    ControlNull();
-    ~ControlNull();
-};
-
-#endif

=== modified file 'mixxx/src/controlobject.cpp'
--- mixxx/src/controlobject.cpp	2013-03-17 16:08:55 +0000
+++ mixxx/src/controlobject.cpp	2013-05-16 01:44:29 +0000
@@ -22,6 +22,7 @@
 
 #include "controlobject.h"
 #include "controlevent.h"
+#include "control/control.h"
 #include "util/stat.h"
 #include "util/timer.h"
 
@@ -31,38 +32,30 @@
 
 
 ControlObject::ControlObject()
-        : ControlObjectBase<double>(),
-          m_dDefaultValue(0),
-          m_bIgnoreNops(true) {
-    set(m_dDefaultValue);
+        : m_pControl(NULL) {
 }
 
-ControlObject::ControlObject(ConfigKey key, bool bIgnoreNops, bool track)
-        : m_dDefaultValue(0),
-          m_key(key),
-          m_bIgnoreNops(bIgnoreNops),
-          m_bTrack(track),
-          m_trackKey("control " + m_key.group + "," + m_key.item),
-          m_trackType(Stat::UNSPECIFIED),
-          m_trackFlags(Stat::COUNT | Stat::SUM | Stat::AVERAGE |
-                       Stat::SAMPLE_VARIANCE | Stat::MIN | Stat::MAX) {
-    set(m_dDefaultValue),
+ControlObject::ControlObject(ConfigKey key, bool bIgnoreNops, bool bTrack)
+        : m_key(key),
+          m_pControl(ControlDoublePrivate::getControl(m_key, true, bIgnoreNops, bTrack)) {
+    connect(m_pControl, SIGNAL(valueChanged(double, QObject*)),
+            this, SLOT(privateValueChanged(double, QObject*)),
+            Qt::DirectConnection);
+
     m_sqCOHashMutex.lock();
     m_sqCOHash.insert(m_key, this);
     m_sqCOHashMutex.unlock();
-
-    if (m_bTrack) {
-        // TODO(rryan): Make configurable.
-        Stat::track(m_trackKey, static_cast<Stat::StatType>(m_trackType),
-                    static_cast<Stat::ComputeFlags>(m_trackFlags), m_dDefaultValue);
-    }
 }
 
-ControlObject::ControlObject(const QString& group, const QString& item, bool bIgnoreNops)
-        : m_dDefaultValue(0),
-          m_key(group, item),
-          m_bIgnoreNops(bIgnoreNops) {
-    set(m_dDefaultValue);
+ControlObject::ControlObject(const QString& group, const QString& item,
+                             bool bIgnoreNops, bool bTrack)
+        : m_key(group, item),
+          m_pControl(ControlDoublePrivate::getControl(m_key, true, bIgnoreNops, bTrack)) {
+
+    connect(m_pControl, SIGNAL(valueChanged(double, QObject*)),
+            this, SLOT(privateValueChanged(double, QObject*)),
+            Qt::DirectConnection);
+
     m_sqCOHashMutex.lock();
     m_sqCOHash.insert(m_key, this);
     m_sqCOHashMutex.unlock();
@@ -72,16 +65,15 @@
     m_sqCOHashMutex.lock();
     m_sqCOHash.remove(m_key);
     m_sqCOHashMutex.unlock();
+}
 
-    ControlObjectThread * obj;
-    m_qProxyListMutex.lock();
-    QListIterator<ControlObjectThread*> it(m_qProxyList);
-    while (it.hasNext())
-    {
-        obj = it.next();
-        obj->slotParentDead();
+void ControlObject::privateValueChanged(double dValue, QObject* pSetter) {
+    // Only emit valueChanged() if we did not originate this change.
+    if (pSetter != this) {
+        emit(valueChanged(dValue));
+    } else {
+        emit(valueChangedFromEngine(dValue));
     }
-    m_qProxyListMutex.unlock();
 }
 
 /*
@@ -114,19 +106,6 @@
 }
 */
 
-void ControlObject::addProxy(ControlObjectThread * pControlObjectThread)
-{
-    m_qProxyListMutex.lock();
-    m_qProxyList.append(pControlObjectThread);
-    m_qProxyListMutex.unlock();
-}
-
-void ControlObject::removeProxy(ControlObjectThread * pControlObjectThread) {
-    m_qProxyListMutex.lock();
-    m_qProxyList.removeAll(pControlObjectThread);
-    m_qProxyListMutex.unlock();
-}
-
 void ControlObject::getControls(QList<ControlObject*>* pControlList) {
     m_sqCOHashMutex.lock();
     for (QHash<ConfigKey, ControlObject*>::const_iterator it = m_sqCOHash.begin();
@@ -148,68 +127,34 @@
     return NULL;
 }
 
-void ControlObject::setValueFromMidi(MidiOpCode o, double v)
-{
-    Q_UNUSED(o);
-    set(v);
-}
-
-double ControlObject::GetMidiValue()
-{
-    return get();
-}
-
-void ControlObject::setValueFromThread(double dValue)
-{
-    set(dValue);
-}
-
-void ControlObject::add(double dValue)
-{
-    if (m_bIgnoreNops && !dValue) {
-        return;
-    }
-    set(get() + dValue);
-}
-
-void ControlObject::sub(double dValue)
-{
-    if (m_bIgnoreNops && !dValue) {
-        return;
-    }
-    set(get() - dValue);
-}
-
-double ControlObject::getValueFromWidget(double v)
-{
-    return v;
-}
-
-double ControlObject::getValueToWidget(double v)
-{
-    return v;
-}
-
-double ControlObject::get() {
-    return getValue();
+void ControlObject::setValueFromMidi(MidiOpCode o, double v) {
+    if (m_pControl) {
+        m_pControl->setMidiParameter(o, v);
+    }
+}
+
+double ControlObject::getValueToMidi() const {
+    return m_pControl ? m_pControl->getMidiParameter() : 0.0;
+}
+
+void ControlObject::setValueFromThread(double dValue, QObject* pSender) {
+    if (m_pControl) {
+        m_pControl->set(dValue, pSender);
+    }
+}
+
+double ControlObject::get() const {
+    return m_pControl ? m_pControl->get() : 0.0;
 }
 
 void ControlObject::reset() {
-    set(m_dDefaultValue);
+    if (m_pControl) {
+        m_pControl->reset(this);
+    }
 }
 
-void ControlObject::set(const double& value, bool emitValueChanged) {
-    if (m_bIgnoreNops) {
-        if (get() == value) {
-            return;
-        }
-    }
-    setValue(value);
-    if (emitValueChanged) {
-        emit(valueChanged(value));
-        if (m_bTrack) {
-            Stat::track(m_trackKey, static_cast<Stat::StatType>(m_trackType),
-                        static_cast<Stat::ComputeFlags>(m_trackFlags), value);
-        }
+void ControlObject::set(const double& value) {
+    if (m_pControl) {
+        m_pControl->set(value, this);
     }
 }

=== modified file 'mixxx/src/controlobject.h'
--- mixxx/src/controlobject.h	2013-03-17 21:00:23 +0000
+++ mixxx/src/controlobject.h	2013-05-16 01:44:29 +0000
@@ -23,22 +23,19 @@
 #include <QMutex>
 
 #include "configobject.h"
-#include "controlobjectthread.h"
 #include "controllers/midi/midimessage.h"
-#include "controlobjectbase.h"
-
-class QWidget;
-class ConfigKey;
-
-class ControlObject 
-    : public QObject,
-      private ControlObjectBase<double> {
+#include "control/control.h"
+
+class ControlObject : public QObject {
     Q_OBJECT
   public:
     ControlObject();
-    ControlObject(ConfigKey key, bool bIgnoreNops=true, bool track=false);
-    ControlObject(const QString& group, const QString& item, bool bIgnoreNops=true);
+    ControlObject(ConfigKey key,
+                  bool bIgnoreNops=true, bool bTrack=false);
+    ControlObject(const QString& group, const QString& item,
+                  bool bIgnoreNops=true, bool bTrack=false);
     virtual ~ControlObject();
+
     /** Returns a pointer to the ControlObject matching the given ConfigKey */
     static ControlObject* getControl(const ConfigKey& key);
     static inline ControlObject* getControl(const QString& group, const QString& item) {
@@ -49,61 +46,48 @@
     // Adds all ControlObjects that currently exist to pControlList
     static void getControls(QList<ControlObject*>* pControlsList);
 
-    // Used to add a pointer to the corresponding ControlObjectThread of this ControlObject
-    void addProxy(ControlObjectThread *pControlObjectThread);
-    // To get rid of a proxy when the corresponding object is being deleted for example
-    void removeProxy(ControlObjectThread *pControlObjectThread);
     // Return the key of the object
-    inline ConfigKey getKey() { return m_key; }
+    inline ConfigKey getKey() const { return m_key; }
     // Returns the value of the ControlObject
-    double get();
+    double get() const;
     // Sets the ControlObject value
-    void set(const double& value, bool emmitValueChanged = true);
+    void set(const double& value);
     // Sets the default value
     void reset();
-    // Add to value
-    void add(double dValue);
-    // Subtract from value
-    void sub(double dValue);
-    // Return a ControlObject value, corresponding to the widget input value.
-    virtual double getValueFromWidget(double dValue);
-    // Return a widget value corresponding to the ControlObject input value.
-    virtual double getValueToWidget(double dValue);
-    // get value (range 0..127)
-    virtual double GetMidiValue();
-    virtual void setDefaultValue(double dValue) {
-        m_dDefaultValue = dValue;
+
+    inline void setDefaultValue(double dValue) {
+        if (m_pControl) {
+            m_pControl->setDefaultValue(dValue);
+        }
     }
-    virtual double defaultValue() const {
-        return m_dDefaultValue;
+    inline double defaultValue() const {
+        return m_pControl ? m_pControl->defaultValue() : 0.0;
     }
 
   signals:
     void valueChanged(double);
+    void valueChangedFromEngine(double);
 
   public:
-    // Called when a widget has changed value.
+    // DEPRECATED: Called to set the control value from the controller
+    // subsystem.
     virtual void setValueFromMidi(MidiOpCode o, double v);
-    // Called when another thread has changed value.
-    virtual void setValueFromThread(double dValue);
+    virtual double getValueToMidi() const;
+    // DEPRECATED: Called to set the control value from another thread.
+    virtual void setValueFromThread(double dValue, QObject* pSetter);
 
   protected:
-    double m_dDefaultValue;
     // Key of the object
     ConfigKey m_key;
+    ControlDoublePrivate* m_pControl;
+
+  private slots:
+    void privateValueChanged(double value, QObject* pSetter);
 
   private:
-    // Whether to ignore set/add/sub()'s which would have no effect
-    bool m_bIgnoreNops;
-    // Whether to track value changes with the stats framework.
-    bool m_bTrack;
-    QString m_trackKey;
-    int m_trackType;
-    int m_trackFlags;
-    // List of associated proxy objects
-    QList<ControlObjectThread*> m_qProxyList;
-    // Mutex for the proxy list
-    QMutex m_qProxyListMutex;
+    inline bool ignoreNops() const {
+        return m_pControl ? m_pControl->ignoreNops() : true;
+    }
 
     // Hash of ControlObject instantiations
     static QHash<ConfigKey,ControlObject*> m_sqCOHash;
@@ -111,5 +95,4 @@
     static QMutex m_sqCOHashMutex;
 };
 
-
 #endif

=== modified file 'mixxx/src/controlobjectthread.cpp'
--- mixxx/src/controlobjectthread.cpp	2013-03-14 14:57:52 +0000
+++ mixxx/src/controlobjectthread.cpp	2013-05-16 01:44:29 +0000
@@ -20,64 +20,63 @@
 
 #include "controlobjectthread.h"
 #include "controlobject.h"
+#include "control/control.h"
 
 ControlObjectThread::ControlObjectThread(ControlObject* pControlObject, QObject* pParent)
         : QObject(pParent),
-          m_pControlObject(pControlObject) {
-    // Register with the associated ControlObject
-    if (m_pControlObject != NULL) {
-        m_pControlObject->addProxy(this);
-        connect(m_pControlObject, SIGNAL(destroyed()),
-                this, SLOT(slotParentDead()));
-        connect(m_pControlObject, SIGNAL(valueChanged(double)),
-                this, SLOT(slotParentValueChanged(double)));
-    }
-    emitValueChanged();
+          m_key(pControlObject ? pControlObject->getKey() : ConfigKey()),
+          m_pControl(NULL) {
+    if (pControlObject) {
+        m_pControl = ControlDoublePrivate::getControl(pControlObject->getKey(), false);
+    }
+    if (m_pControl) {
+        connect(m_pControl, SIGNAL(valueChanged(double, QObject*)),
+                this, SLOT(slotValueChanged(double, QObject*)),
+                Qt::DirectConnection);
+    }
 }
 
 ControlObjectThread::~ControlObjectThread() {
-    if (m_pControlObject) {
-        // Our parent is still around, make sure it doesn't send us any more events
-        m_pControlObject->removeProxy(this);
-    }
+}
+
+bool ControlObjectThread::valid() const {
+    return m_pControl != NULL;
 }
 
 double ControlObjectThread::get() {
-    if (m_pControlObject) {
-        return m_pControlObject->get();
-    } else {
-        return 0.0;
-    }
-
+    return m_pControl ? m_pControl->get() : 0.0;
 }
 
 void ControlObjectThread::slotSet(double v) {
-    m_pControlObject->set(v);
+    set(v);
+}
+
+void ControlObjectThread::set(double v) {
+    if (m_pControl) {
+        m_pControl->set(v, this);
+    }
+}
+
+void ControlObjectThread::reset() {
+    if (m_pControl) {
+        // NOTE(rryan): This is important. The originator of this action does
+        // not know the resulting value so it makes sense that we should emit a
+        // general valueChanged() signal even though the change originated from
+        // us. For this reason, we provide NULL here so that the change is
+        // broadcast as valueChanged() and not valueChangedByThis().
+        m_pControl->reset(NULL);
+    }
 }
 
 void ControlObjectThread::emitValueChanged() {
     emit(valueChanged(get()));
 }
 
-void ControlObjectThread::add(double v) {
-    m_pControlObject->add(v);
-}
-
-void ControlObjectThread::sub(double v) {
-    m_pControlObject->sub(v);
-}
-
-void ControlObjectThread::slotParentDead() {
-    // Now we've got a chance of avoiding segfaults with judicious
-    // use of if(m_pControlObject)
-    m_pControlObject = NULL;
-}
-
-void ControlObjectThread::slotParentValueChanged(double v) {
-    // This is base implementation of this function without scaling
-    emit(valueChanged(v));
-}
-
-ControlObject* ControlObjectThread::getControlObject() {
-   return m_pControlObject;
+void ControlObjectThread::slotValueChanged(double v, QObject* pSetter) {
+    if (pSetter != this) {
+        // This is base implementation of this function without scaling
+        emit(valueChanged(v));
+    } else {
+        emit(valueChangedByThis(v));
+    }
 }

=== modified file 'mixxx/src/controlobjectthread.h'
--- mixxx/src/controlobjectthread.h	2013-03-14 14:57:52 +0000
+++ mixxx/src/controlobjectthread.h	2013-05-16 01:44:29 +0000
@@ -24,6 +24,9 @@
 #include <qwaitcondition.h>
 #include <QQueue>
 
+#include "configobject.h"
+
+class ControlDoublePrivate;
 class ControlObject;
 
 class ControlObjectThread : public QObject {
@@ -32,40 +35,41 @@
     ControlObjectThread(ControlObject *pControlObject, QObject* pParent=NULL);
     virtual ~ControlObjectThread();
 
-    /** Returns the value of the object. Thread safe, blocking */
-    virtual double get();
-    /** Setting the value from an external controller. This happen when a ControlObject has
-      * changed and its value is syncronized with this object. Thread safe, non blocking. Returns
-      * true if successful, otherwise false. Thread safe, non blocking. */
-    virtual void add(double v);
-    /** Subtracts a value to the value property. Notification in a similar way
-     * to set. Thread safe, blocking. */
-    virtual void sub(double v);
     /** Called from update(); */
     void emitValueChanged();
 
-
-    // FIXME: Dangerous GED hack
-    ControlObject* getControlObject();
-
-public slots:
-    /** The value is changed by the engine, and the corresponding ControlObject is updated.
-      * Thread safe, blocking. */
+    inline ConfigKey getKey() const {
+        return m_key;
+    }
+
+    // Returns the value of the object. Thread safe, non-blocking.
+    virtual double get();
+
+    bool valid() const;
+
+  public slots:
+    // Set the control to a new value. Non-blocking.
     virtual void slotSet(double v);
-
-    // The danger signal! This is for safety in wierd shutdown scenarios where the
-    // ControlObject dies to avoid segfaults.
-    void slotParentDead();
-
-    // Receives the Value from the parent and may scales the vale and re-emit it again
-    virtual void slotParentValueChanged(double v);
-
-signals:
+    // Sets the control value to v. Thread safe, non-blocking.
+    virtual void set(double v);
+    // Resets the control to its default value. Thread safe, non-blocking.
+    virtual void reset();
+
+  signals:
     void valueChanged(double);
-
-protected:
-    /// Pointer to corresponding ControlObject
-    ControlObject *m_pControlObject;
+    // This means that the control value has changed as a result of a mutation
+    // (set/add/sub/reset) originating from this object.
+    void valueChangedByThis(double);
+
+  protected slots:
+    // Receives the value from the master control and re-emits either
+    // valueChanged(double) or valueChangedByThis(double) based on pSetter.
+    virtual void slotValueChanged(double v, QObject* pSetter);
+
+  protected:
+    ConfigKey m_key;
+    // Pointer to connected control.
+    ControlDoublePrivate* m_pControl;
 };
 
 #endif

=== modified file 'mixxx/src/controlobjectthreadmain.cpp'
--- mixxx/src/controlobjectthreadmain.cpp	2013-03-14 00:13:02 +0000
+++ mixxx/src/controlobjectthreadmain.cpp	2013-05-16 01:44:29 +0000
@@ -13,6 +13,37 @@
 ControlObjectThreadMain::ControlObjectThreadMain(ControlObject * pControlObject, QObject* pParent)
         : ControlObjectThread(pControlObject, pParent) {
     setObjectName("ControlObjectThreadMain");
-}
-
-
+    installEventFilter(this);
+}
+
+bool ControlObjectThreadMain::eventFilter(QObject* o, QEvent* e) {
+    // Handle events
+    if (e && e->type() == MIXXXEVENT_CONTROL) {
+        ControlEvent * ce = (ControlEvent *)e;
+        emit(valueChanged(ce->value()));
+    } else {
+        return QObject::eventFilter(o,e);
+    }
+    return true;
+}
+
+void ControlObjectThreadMain::slotValueChanged(double, QObject* pSetter) {
+    // The value argument to this function is in value space, but for some of
+    // our subclasses (e.g. ControlObjectThreadWidget) emit valueChanged(double)
+    // should emit in parameter space. So we emit the value of get() instead
+    // which will get the correct value.
+
+    // If we are already running in the main thread, then go ahead and update.
+    if (QThread::currentThread() == QApplication::instance()->thread()) {
+        if (pSetter != this) {
+            emit(valueChanged(get()));
+        } else {
+            emit(valueChangedByThis(get()));
+        }
+    } else {
+        // Otherwise, we have to post the event to the main thread event queue
+        // and then catch the event via eventFilter.
+        QApplication::postEvent(this, new ControlEvent(get()));
+    }
+
+}

=== modified file 'mixxx/src/controlobjectthreadmain.h'
--- mixxx/src/controlobjectthreadmain.h	2013-03-14 00:13:02 +0000
+++ mixxx/src/controlobjectthreadmain.h	2013-05-16 01:44:29 +0000
@@ -12,7 +12,7 @@
 // ControlObjectThreadMain is a variant of ControlObjectThread that should only
 // ever have its methods called by the main thread. The benefit is that the
 // valueChanged() signal is proxied to the main thread automatically and the
-// get()/set()/add()/sub() methods are lock-free and performant relative to
+// get()/set() methods are lock-free and performant relative to
 // ControlObjectThread since COT requires using a mutex to maintain the
 // integrity of the control value. If you create a COTM, you must make sure to
 // only call its methods from the main thread.
@@ -20,6 +20,14 @@
     Q_OBJECT
   public:
     ControlObjectThreadMain(ControlObject *pControlObject, QObject* pParent=NULL);
+
+    bool eventFilter(QObject* o, QEvent* e);
+
+  protected slots:
+    // Receives the value from the master control, proxies it to the main
+    // thread, and re-emits either valueChanged(double) or
+    // valueChangedByThis(double) based on pSetter.
+    virtual void slotValueChanged(double v, QObject* pSetter);
 };
 
 #endif

=== modified file 'mixxx/src/controlobjectthreadwidget.cpp'
--- mixxx/src/controlobjectthreadwidget.cpp	2013-03-14 18:33:05 +0000
+++ mixxx/src/controlobjectthreadwidget.cpp	2013-05-16 01:44:29 +0000
@@ -6,12 +6,6 @@
 
 ControlObjectThreadWidget::ControlObjectThreadWidget(ControlObject * pControlObject, QObject* pParent)
         : ControlObjectThreadMain(pControlObject, pParent) {
-    // ControlObjectThread's constructor sets m_dValue to
-    // m_pControlObject->get(). Since we represent the widget's value, we need
-    // to reset m_dValue to be the result of getValueToWidget.
-    if (m_pControlObject != NULL) {
-        slotParentValueChanged(get());
-    }
 }
 
 ControlObjectThreadWidget::~ControlObjectThreadWidget() {
@@ -22,7 +16,7 @@
                                           EmitOption emitOption, Qt::MouseButton state) {
     if (connectValueFromWidget) {
         connect(widget, SIGNAL(valueReset()),
-                this, SLOT(slotReset()));
+                this, SLOT(reset()));
 
         if (emitOption & EMIT_ON_PRESS) {
             switch (state) {
@@ -77,37 +71,12 @@
     emit(valueChanged(get()));
 }
 
-void ControlObjectThreadWidget::slotReset() {
-    if (m_pControlObject) {
-        m_pControlObject->reset();
-
-    }
-}
-
 double ControlObjectThreadWidget::get() {
-    if (m_pControlObject) {
-        return m_pControlObject->getValueToWidget(m_pControlObject->get());
-    } else {
-        return 0.0;
-    }
-}
-
-void ControlObjectThreadWidget::slotSet(double v) {
-    m_pControlObject->set(m_pControlObject->getValueFromWidget(v));
-}
-
-void ControlObjectThreadWidget::add(double v) {
-    m_pControlObject->add(m_pControlObject->getValueFromWidget(v));
-}
-
-void ControlObjectThreadWidget::sub(double v) {
-    m_pControlObject->sub(m_pControlObject->getValueFromWidget(v));
-}
-
-// Receives the Value from the parent and may scales the vale and re-emit it again
-void ControlObjectThreadWidget::slotParentValueChanged(double v) {
-    if (m_pControlObject) {
-        double widgetValue = m_pControlObject->getValueToWidget(v);
-        emit(valueChanged(widgetValue));
+    return m_pControl ? m_pControl->getWidgetParameter() : 0.0;
+}
+
+void ControlObjectThreadWidget::set(double v) {
+    if (m_pControl) {
+        m_pControl->setWidgetParameter(v, this);
     }
 }

=== modified file 'mixxx/src/controlobjectthreadwidget.h'
--- mixxx/src/controlobjectthreadwidget.h	2013-03-14 14:57:52 +0000
+++ mixxx/src/controlobjectthreadwidget.h	2013-05-16 01:44:29 +0000
@@ -22,10 +22,9 @@
 @author Tue Haste Andersen
 */
 
-class ControlObjectThreadWidget : public ControlObjectThreadMain
-{
+class ControlObjectThreadWidget : public ControlObjectThreadMain {
     Q_OBJECT
-public:
+  public:
 
     enum EmitOption {
         EMIT_NEVER                = 0x00,
@@ -45,15 +44,8 @@
 
     virtual double get();
 
-    virtual void add(double v);
-
-    virtual void sub(double v);
-
-  private slots:
-    void slotReset();
-    // Receives the Value from the parent and may scales the vale and re-emit it again
-    virtual void slotSet(double v);
-    virtual void slotParentValueChanged(double v);
+  public slots:
+    virtual void set(double v);
 };
 
 #endif

=== modified file 'mixxx/src/controlpotmeter.cpp'
--- mixxx/src/controlpotmeter.cpp	2013-03-17 16:08:55 +0000
+++ mixxx/src/controlpotmeter.cpp	2013-05-16 01:44:29 +0000
@@ -100,13 +100,11 @@
 {
 }
 
-double ControlPotmeter::getMin()
-{
+double ControlPotmeter::getMin() const {
     return m_dMinValue;
 }
 
-double ControlPotmeter::getMax()
-{
+double ControlPotmeter::getMax() const {
     return m_dMaxValue;
 }
 
@@ -125,47 +123,19 @@
     m_dMinValue = dMinValue;
     m_dMaxValue = dMaxValue;
     m_dValueRange = m_dMaxValue - m_dMinValue;
-    m_dDefaultValue = m_dMinValue + 0.5 * m_dValueRange;
-    set(m_dDefaultValue);
+    double default_value = m_dMinValue + 0.5 * m_dValueRange;
+
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlPotmeterBehavior(dMinValue, dMaxValue));
+        delete pOldBehavior;
+    }
+
+    setDefaultValue(default_value);
+    set(default_value);
     //qDebug() << "" << this << ", min " << m_dMinValue << ", max " << m_dMaxValue << ", range " << m_dValueRange << ", val " << m_dValue;
 }
 
-double ControlPotmeter::getValueToWidget(double dValue)
-{
-    double out = (dValue-m_dMinValue)/m_dValueRange;
-    return (out < 0.5) ? out*128. : out*126. + 1.;
-}
-
-double ControlPotmeter::GetMidiValue()
-{
-    double out = (get()-m_dMinValue)/m_dValueRange;
-    return (out < 0.5) ? out*128. : out*126. + 1.;
-}
-
-double ControlPotmeter::getValueFromWidget(double dValue)
-{
-    double out = (dValue < 64) ? dValue / 128. : (dValue-1) / 126.;
-    return m_dMinValue + out * m_dValueRange;
-}
-
-void ControlPotmeter::setValueFromThread(double dValue)
-{
-    if (dValue > m_dMaxValue) {
-        set(m_dMaxValue);
-    } else if (dValue < m_dMinValue) {
-        set(m_dMinValue);
-    } else {
-        set(dValue);
-    }
-}
-
-void ControlPotmeter::setValueFromMidi(MidiOpCode o, double v)
-{
-    Q_UNUSED(o);
-    double out = (v < 64) ? v / 128. : (v-1) / 126.;
-    set(m_dMinValue + out * m_dValueRange);
-}
-
 void ControlPotmeter::incValue(double keypos)
 {
     if (keypos>0)
@@ -245,7 +215,7 @@
 
 void ControlPotmeter::setToDefault(double v) {
     if (v > 0) {
-        set(m_dDefaultValue);
+        reset();
     }
 }
 

=== modified file 'mixxx/src/controlpotmeter.h'
--- mixxx/src/controlpotmeter.h	2013-03-17 16:08:55 +0000
+++ mixxx/src/controlpotmeter.h	2013-05-16 01:44:29 +0000
@@ -35,22 +35,15 @@
     ControlPotmeter(ConfigKey key, double dMinValue=0.0, double dMaxValue=1.0);
     ~ControlPotmeter();
     /** Returns the minimum allowed value */
-    double getMin();
+    double getMin() const;
     /** Returns the maximum allowed value */
-    double getMax();
+    double getMax() const;
     /** Sets the step size of the associated PushButtons */
     void setStep(double);
     /** Sets the small step size of the associated PushButtons */
     void setSmallStep(double);
-    /** Sets the minimum and maximum allowed value. The control value is reset when calling
-      * this method */
-    void setRange(double dMinValue, double dMaxValue);
-    double getValueFromWidget(double dValue);
-    double getValueToWidget(double dValue);
-    double GetMidiValue();
 
 public slots:
-    void setValueFromThread(double dValue);
     /** Increases the value. This method is called from an associated PushButton control */
     void incValue(double);
     /** Decreases the value. This method is called from an associated PushButton control */
@@ -73,7 +66,9 @@
     void toggleMinusValue(double);
 
 protected:
-    void setValueFromMidi(MidiOpCode o, double v);
+    /** Sets the minimum and maximum allowed value. The control value is reset when calling
+      * this method */
+    void setRange(double dMinValue, double dMaxValue);
 
     double m_dMaxValue;
     double m_dMinValue;

=== modified file 'mixxx/src/controlpushbutton.cpp'
--- mixxx/src/controlpushbutton.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controlpushbutton.cpp	2013-05-16 01:44:29 +0000
@@ -17,9 +17,6 @@
 
 #include "controlpushbutton.h"
 
-// static
-const int ControlPushButton::kPowerWindowTimeMillis = 300;
-
 /* -------- ------------------------------------------------------
    Purpose: Creates a new simulated latching push-button.
    Input:   key - Key for the configuration file
@@ -28,6 +25,13 @@
         ControlObject(key, false),
         m_buttonMode(PUSH),
         m_iNoStates(2) {
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlPushButtonBehavior(
+                static_cast<ControlPushButtonBehavior::ButtonMode>(m_buttonMode),
+                m_iNoStates));
+        delete pOldBehavior;
+    }
 }
 
 ControlPushButton::~ControlPushButton() {
@@ -37,62 +41,25 @@
 void ControlPushButton::setButtonMode(enum ButtonMode mode) {
     //qDebug() << "Setting " << m_Key.group << m_Key.item << "as toggle";
     m_buttonMode = mode;
+
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlPushButtonBehavior(
+                static_cast<ControlPushButtonBehavior::ButtonMode>(m_buttonMode),
+                m_iNoStates));
+        delete pOldBehavior;
+    }
 }
 
 void ControlPushButton::setStates(int num_states) {
     m_iNoStates = num_states;
-}
-
-void ControlPushButton::setValueFromMidi(MidiOpCode o, double v) {
-    // keyboard events are handled by this function as well
-    //if (m_bMidiSimulateLatching)
-
-    //qDebug() << "bMidiSimulateLatching is true!";
-    // Only react on NOTE_ON midi events if simulating latching...
-
-    //qDebug() << o << v;
-
-    // This block makes push-buttons act as power window buttons.
-    if (m_buttonMode == POWERWINDOW && m_iNoStates == 2) {
-        if (o == MIDI_NOTE_ON) {
-            if (v > 0.) {
-                double value = get();
-                set(!value);
-                m_pushTimer.setSingleShot(true);
-                m_pushTimer.start(kPowerWindowTimeMillis);
-            }
-        } else if (o == MIDI_NOTE_OFF) {
-            if (!m_pushTimer.isActive()) {
-                set(0.0);
-            }
-        }
-    } else if (m_buttonMode == TOGGLE) {
-        // 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...
-                double value = get();
-                value++;
-                if (value >= m_iNoStates) {
-                    set(0);
-                } else {
-                    set(value);
-                }
-            }
-        } else {
-            if (o == MIDI_NOTE_ON) {
-                if (v > 0.) {
-                    double value = get();
-                    set(!value);
-                }
-            }
-        }
-    } else { //Not a toggle button (trigger only when button pushed)
-        if (o == MIDI_NOTE_ON) {
-            double value = get();
-            set(!value);
-        } else if (o == MIDI_NOTE_OFF) {
-            set(0.0);
-        }
+
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlPushButtonBehavior(
+                static_cast<ControlPushButtonBehavior::ButtonMode>(m_buttonMode),
+                m_iNoStates));
+        delete pOldBehavior;
     }
 }
 

=== modified file 'mixxx/src/controlpushbutton.h'
--- mixxx/src/controlpushbutton.h	2012-05-01 05:59:37 +0000
+++ mixxx/src/controlpushbutton.h	2013-05-16 01:44:29 +0000
@@ -21,7 +21,6 @@
 #include "controlobject.h"
 #include "controllers/midi/midimessage.h"
 #include "defs.h"
-#include <QTimer>
 
 /**
   *@author Tue and Ken Haste Andersen
@@ -31,11 +30,10 @@
     Q_OBJECT
   public:
     enum ButtonMode {
-         PUSH,
+         PUSH = 0,
          TOGGLE,
          POWERWINDOW
     };
-    static const int kPowerWindowTimeMillis;
 
     ControlPushButton(ConfigKey key);
     virtual ~ControlPushButton();
@@ -46,13 +44,9 @@
     void setButtonMode(enum ButtonMode mode);
     void setStates(int num_states);
 
-  protected:
-    void setValueFromMidi(MidiOpCode o, double v);
-
   private:
     enum ButtonMode m_buttonMode;
     int m_iNoStates;
-    QTimer m_pushTimer;
 };
 
 #endif

=== modified file 'mixxx/src/controlttrotary.cpp'
--- mixxx/src/controlttrotary.cpp	2013-03-13 16:31:06 +0000
+++ mixxx/src/controlttrotary.cpp	2013-05-16 01:44:29 +0000
@@ -20,30 +20,13 @@
    Purpose: Creates a new rotary encoder
    Input:   key
    -------- ------------------------------------------------------ */
-ControlTTRotary::ControlTTRotary(ConfigKey key) : ControlObject(key)
-{
-}
-
-double ControlTTRotary::getValueFromWidget(double dValue)
-{
-    // Non-linear scaling
-    double temp = (((dValue-64.)*(dValue-64.))/64.);
-    if ((dValue-64.)<0)
-        temp = -temp;
-
-    //qDebug() << "tt rotary in " << dValue << ", out " << temp;
-
-    return temp; //dValue-64.;
-}
-
-double ControlTTRotary::getValueToWidget(double dValue)
-{
-    return dValue*200.+64.;
-}
-
-void ControlTTRotary::setValueFromMidi(MidiOpCode o, double v)
-{
-    Q_UNUSED(o);
-    set(v);
-}
+ControlTTRotary::ControlTTRotary(ConfigKey key) : ControlObject(key) {
+    if (m_pControl) {
+        ControlNumericBehavior* pOldBehavior = m_pControl->setBehavior(
+            new ControlTTRotaryBehavior());
+        delete pOldBehavior;
+    }
+}
+
+
 

=== modified file 'mixxx/src/controlttrotary.h'
--- mixxx/src/controlttrotary.h	2012-03-17 17:42:44 +0000
+++ mixxx/src/controlttrotary.h	2013-05-16 01:44:29 +0000
@@ -20,20 +20,10 @@
 #include "configobject.h"
 #include "controlobject.h"
 
-/** Turn Table rotary controller class. The turntable rotary sends midi events: 0 when turning
-  * backwards, and 1 when turning forward. This class keeps track of it's speed, using a timer
-  * interrupt */
-class ControlTTRotary : public ControlObject
-{
+class ControlTTRotary : public ControlObject {
     Q_OBJECT
-public:
+  public:
     ControlTTRotary(ConfigKey key);
-    
-    double getValueFromWidget(double dValue);
-    double getValueToWidget(double dValue);
-    
-protected:
-    void setValueFromMidi(MidiOpCode o, double v);
 };
 
 #endif

=== modified file 'mixxx/src/dlgabout.cpp'
--- mixxx/src/dlgabout.cpp	2011-12-22 18:55:10 +0000
+++ mixxx/src/dlgabout.cpp	2013-05-16 01:44:29 +0000
@@ -17,15 +17,202 @@
 
 #include "dlgabout.h"
 
-#include <qlineedit.h>
-#include <qwidget.h>
-#include <qslider.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qpushbutton.h>
+#include "defs_version.h"
 
 DlgAbout::DlgAbout(QWidget* parent) :  QDialog(parent), Ui::DlgAboutDlg() {
     setupUi(this);
+
+    QString buildBranch, buildRevision;
+#ifdef BUILD_BRANCH
+    buildBranch = BUILD_BRANCH;
+#endif
+#ifdef BUILD_REV
+    buildRevision = BUILD_REV;
+#endif
+
+    QStringList version;
+    version.append(VERSION);
+    if (!buildBranch.isEmpty() || !buildRevision.isEmpty()) {
+        QStringList buildInfo;
+        buildInfo.append("build");
+        if (!buildBranch.isEmpty()) {
+            buildInfo.append(buildBranch);
+        }
+        if (!buildRevision.isEmpty()) {
+            buildInfo.append(QString("r%1").arg(buildRevision));
+        }
+        version.append(QString("(%1)").arg(buildInfo.join(" ")));
+    }
+    version_label->setText(version.join(" "));
+
+    QString s_devTeam = QString(tr("Mixxx %1 Development Team")).arg(VERSION);
+    QString s_contributions = tr("With contributions from:");
+    QString s_specialThanks = tr("And special thanks to:");
+    QString s_pastDevs = tr("Past Developers");
+    QString s_pastContribs = tr("Past Contributors");
+
+    QString credits = QString("<p align=\"center\"><b>%1</b></p>"
+"<p align=\"center\">"
+"Albert Santoni<br>"
+"RJ Ryan<br>"
+"Sean Pappalardo<br>"
+"Phillip Whelan<br>"
+"Tobias Rafreider<br>"
+"S. Brandt<br>"
+"Bill Good<br>"
+"Owen Williams<br>"
+"Vittorio Colao<br>"
+"Daniel Sch&uuml;rmann<br>"
+"Thomas Vincent<br>"
+"Ilkka Tuohela<br>"
+"Max Linke<br>"
+
+"</p>"
+"<p align=\"center\"><b>%2</b></p>"
+"<p align=\"center\">"
+"Mark Hills<br>"
+"Andre Roth<br>"
+"Robin Sheat<br>"
+"Mark Glines<br>"
+"Mathieu Rene<br>"
+"Miko Kiiski<br>"
+"Brian Jackson<br>"
+"Andreas Pflug<br>"
+"Bas van Schaik<br>"
+"J&aacute;n Jockusch<br>"
+"Oliver St&ouml;neberg<br>"
+"Jan Jockusch<br>"
+"C. Stewart<br>"
+"Bill Egert<br>"
+"Zach Shutters<br>"
+"Owen Bullock<br>"
+"Graeme Mathieson<br>"
+"Sebastian Actist<br>"
+"Jussi Sainio<br>"
+"David Gnedt<br>"
+"Antonio Passamani<br>"
+"Guy Martin<br>"
+"Anders Gunnarsson<br>"
+"Alex Barker<br>"
+"Mikko Jania<br>"
+"Juan Pedro Bol&iacute;var Puente<br>"
+"Linus Amvall<br>"
+"Irwin C&eacute;spedes B<br>"
+"Micz Flor<br>"
+"Daniel James<br>"
+"Mika Haulo<br>"
+"Matthew Mikolay<br>"
+"Tom Mast<br>"
+"Miko Kiiski<br>"
+"Vin&iacute;cius Dias dos Santos<br>"
+"Joe Colosimo<br>"
+"Shashank Kumar<br>"
+"Till Hofmann<br>"
+"Peter V&aacute;gner<br>"
+"Thanasis Liappis<br>"
+"Jens Nachtigall<br>"
+"Scott Ullrich<br>"
+"Jonas &Aring;dahl<br>"
+"Jonathan Costers<br>"
+"Daniel Lindenfelser<br>"
+"Maxime Bochon<br>"
+"Akash Shetye<br>"
+"Pascal Bleser<br>"
+"Florian Mahlknecht<br>"
+"Ben Clark<br>"
+"Tom Gascoigne<br>"
+"Neale Pickett<br>"
+"Aaron Mavrinac<br>"
+"Markus H&auml;rer<br>"
+"Andrey Smelov<br>"
+"Scott Stewart<br>"
+"Nimatek<br>"
+"Alban Bedel<br>"
+"Stefan N&uuml;rnberger<br>"
+"Steven Boswell<br>"
+"Jo&atilde;o Reys Santos<br>"
+"Carl Pillot<br>"
+"Vedant Agarwala<br>"
+
+"</p>"
+"<p align=\"center\"><b>%3</b></p>"
+"<p align=\"center\">"
+"Vestax<br>"
+"Stanton<br>"
+"Hercules<br>"
+"EKS<br>"
+"Echo Digital Audio<br>"
+"JP Disco<br>"
+"Google Summer of Code<br>"
+"Adam Bellinson<br>"
+"Alexandre Bancel<br>"
+"Melanie Thielker<br>"
+"Julien Rosener<br>"
+"Pau Arum&iacute;<br>"
+"David Garcia<br>"
+"Seb Ruiz<br>"
+"Joseph Mattiello<br>"
+"</p>"
+
+"<p align=\"center\"><b>%4</b></p>"
+"<p align=\"center\">"
+"Tue Haste Andersen<br>"
+"Ken Haste Andersen<br>"
+"Cedric Gestes<br>"
+"John Sully<br>"
+"Torben Hohn<br>"
+"Peter Chang<br>"
+"Micah Lee<br>"
+"Ben Wheeler<br>"
+"Wesley Stessens<br>"
+"Nathan Prado<br>"
+"Zach Elko<br>"
+"Tom Care<br>"
+"Pawel Bartkiewicz<br>"
+"Nick Guenther<br>"
+"Adam Davison<br>"
+"Garth Dahlstrom<br>"
+"</p>"
+
+"<p align=\"center\"><b>%5</b></p>"
+"<p align=\"center\">"
+"Ludek Hor&#225;cek<br>"
+"Svein Magne Bang<br>"
+"Kristoffer Jensen<br>"
+"Ingo Kossyk<br>"
+"Mads Holm<br>"
+"Lukas Zapletal<br>"
+"Jeremie Zimmermann<br>"
+"Gianluca Romanin<br>"
+"Tim Jackson<br>"
+"Stefan Langhammer<br>"
+"Frank Willascheck<br>"
+"Jeff Nelson<br>"
+"Kevin Schaper<br>"
+"Alex Markley<br>"
+"Oriol Puigb&oacute;<br>"
+"Ulrich Heske<br>"
+"James Hagerman<br>"
+"quil0m80<br>"
+"Martin Sakm&#225;r<br>"
+"Ilian Persson<br>"
+"Dave Jarvis<br>"
+"Thomas Baag<br>"
+"Karlis Kalnins<br>"
+"Amias Channer<br>"
+"Sacha Berger<br>"
+"James Evans<br>"
+"Martin Sakmar<br>"
+"Navaho Gunleg<br>"
+"Gavin Pryke<br>"
+"Michael Pujos<br>"
+"Claudio Bantaloukas<br>"
+"Pavol Rusnak<br>"
+"Bruno Buccolo<br>"
+"Ryan Baker<br>"
+    "</p>").arg(s_devTeam,s_contributions,s_specialThanks,s_pastDevs,s_pastContribs);
+
+    textBrowser->setHtml(credits);
 }
 
 DlgAbout::~DlgAbout() {

=== removed file 'mixxx/src/dlgbpmscheme.cpp'
--- mixxx/src/dlgbpmscheme.cpp	2010-01-14 23:32:38 +0000
+++ mixxx/src/dlgbpmscheme.cpp	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/***************************************************************************
-                          dlgbpmscheme.cpp  -  description
-                             -------------------
-    begin                : Thu Jun 7 2007
-    copyright            : (C) 2007 by John Sully
-    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 "dlgbpmscheme.h"
-#include "bpm/bpmscheme.h"
-
-DlgBpmScheme::DlgBpmScheme(BpmScheme *& bpmScheme) : QDialog(), Ui::DlgBpmSchemeDlg(), m_BpmScheme(bpmScheme)
-{
-    setupUi(this);
-    
-    connect(buttonBox, SIGNAL(accepted()), this,      SLOT(slotApply()));
-    //connect(chkAnalyzeEntireSong,   SIGNAL(stateChanged(int)), this, SLOT(slotSetAnalyzeMode(int)));
-    
-    // Check to see if this is a new scheme. If so, create it with default values
-    if(!bpmScheme)
-    {
-        bpmScheme = new BpmScheme("New Scheme Name", 50, 150, false);
-    }
-    
-    // Populate the dialog values
-    txtSchemeName->setText(bpmScheme->getName());
-    spinBpmMin->setValue(bpmScheme->getMinBpm());
-    spinBpmMax->setValue(bpmScheme->getMaxBpm());
-    chkAnalyzeEntireSong->setChecked(bpmScheme->getAnalyzeEntireSong());    
-}
-
-DlgBpmScheme::~DlgBpmScheme()
-{
-}
-
-void DlgBpmScheme::slotApply()
-{
-    m_BpmScheme->setName(txtSchemeName->text());
-    m_BpmScheme->setMinBpm(spinBpmMin->value());
-    m_BpmScheme->setMaxBpm(spinBpmMax->value());
-    m_BpmScheme->setAnalyzeEntireSong(chkAnalyzeEntireSong->isChecked());
-}
-
-void DlgBpmScheme::slotUpdate()
-{
-}
-

=== removed file 'mixxx/src/dlgbpmscheme.h'
--- mixxx/src/dlgbpmscheme.h	2008-01-30 13:37:36 +0000
+++ mixxx/src/dlgbpmscheme.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-
-
-/***************************************************************************
- *                                                                         *
- *   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 DLGBPMSCHEME_H
-#define DLGBPMSCHEME_H
-
-#include "ui_dlgbpmschemedlg.h"
-#include "configobject.h"
-#include <qstring.h>
-
-class BpmScheme;
-
-class QWidget;
-
-class DlgBpmScheme : public QDialog, Ui::DlgBpmSchemeDlg  {
-    Q_OBJECT
-public:
-    DlgBpmScheme(BpmScheme *& bpmScheme);
-    ~DlgBpmScheme();
-public slots:
-     /** Apply changes to widget */
-    void slotApply();
-    void slotUpdate();
-signals:
-    void apply(const QString &);
-private:
-    BpmScheme *& m_BpmScheme;
-};
-
-#endif

=== removed file 'mixxx/src/dlgbpmschemedlg.ui'
--- mixxx/src/dlgbpmschemedlg.ui	2012-04-30 18:38:29 +0000
+++ mixxx/src/dlgbpmschemedlg.ui	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgBpmSchemeDlg</class>
- <widget class="QDialog" name="DlgBpmSchemeDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>352</width>
-    <height>172</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>BPM Scheme</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>130</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="txtSchemeName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>10</y>
-     <width>231</width>
-     <height>23</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>111</width>
-     <height>18</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Scheme Name:</string>
-   </property>
-   <property name="buddy">
-    <cstring>txtSchemeName</cstring>
-   </property>
-  </widget>
-  <widget class="QGroupBox" name="groupBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>331</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>BPM Range</string>
-   </property>
-   <widget class="QSpinBox" name="spinBpmMin">
-    <property name="geometry">
-     <rect>
-      <x>80</x>
-      <y>20</y>
-      <width>71</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="minimum">
-     <number>1</number>
-    </property>
-    <property name="maximum">
-     <number>220</number>
-    </property>
-   </widget>
-   <widget class="QSpinBox" name="spinBpmMax">
-    <property name="geometry">
-     <rect>
-      <x>210</x>
-      <y>20</y>
-      <width>71</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="minimum">
-     <number>1</number>
-    </property>
-    <property name="maximum">
-     <number>220</number>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_2">
-    <property name="geometry">
-     <rect>
-      <x>170</x>
-      <y>20</y>
-      <width>31</width>
-      <height>18</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Max</string>
-    </property>
-    <property name="buddy">
-     <cstring>spinBpmMax</cstring>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_3">
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>20</y>
-      <width>31</width>
-      <height>18</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Min</string>
-    </property>
-    <property name="buddy">
-     <cstring>spinBpmMin</cstring>
-    </property>
-   </widget>
-  </widget>
-  <widget class="QCheckBox" name="chkAnalyzeEntireSong">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>100</y>
-     <width>201</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Analyze Entire Track</string>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>DlgBpmSchemeDlg</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>DlgBpmSchemeDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

=== removed file 'mixxx/src/dlgprefbpm.cpp'
--- mixxx/src/dlgprefbpm.cpp	2012-11-20 00:40:18 +0000
+++ mixxx/src/dlgprefbpm.cpp	1970-01-01 00:00:00 +0000
@@ -1,455 +0,0 @@
-/***************************************************************************
-                          dlgprefbpm.cpp  -  description
-                             -------------------
-    begin                : Thu Jun 7 2007
-    copyright            : (C) 2007 by John Sully
-    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 <qlineedit.h>
-#include <qfiledialog.h>
-#include <qwidget.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qpushbutton.h>
-#include <QtCore>
-#include <QMessageBox>
-
-#include "dlgprefbpm.h"
-#include "dlgbpmscheme.h"
-#include "bpm/bpmscheme.h"
-#include "xmlparse.h"
-#include "mixxx.h"
-
-#define CONFIG_KEY "[BPM]"
-
-DlgPrefBpm::DlgPrefBpm(QWidget * parent, ConfigObject<ConfigValue> * _config)
-        : QWidget(parent) {
-    config = _config;
-
-    setupUi(this);
-
-    // Connection
-    connect(chkDetectOnImport,      SIGNAL(stateChanged(int)), this, SLOT(slotSetBpmDetectOnImport(int)));
-    connect(chkWriteID3,            SIGNAL(stateChanged(int)), this, SLOT(slotSetWriteID3Tag(int)));
-    connect(chkEnableBpmDetection,  SIGNAL(stateChanged(int)), this, SLOT(slotSetBpmEnabled(int)));
-    connect(chkAboveRange,          SIGNAL(stateChanged(int)), this, SLOT(slotSetAboveRange(int)));
-
-    // TODO: Move this over the the scheme dialog
-
-    connect(btnAdd,        SIGNAL(pressed()),         this, SLOT(slotAddBpmScheme()));
-    connect(btnEdit,       SIGNAL(pressed()),         this, SLOT(slotEditBpmScheme()));
-    connect(btnDelete,     SIGNAL(pressed()),         this, SLOT(slotDeleteBpmScheme()));
-    connect(btnDefault,    SIGNAL(pressed()),         this, SLOT(slotDefaultBpmScheme()));
-
-
-    // Determine if the config value has already been set. If not, default to enabled
-    QString sBpmEnabled = config->getValueString(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled"));
-    if(sBpmEnabled.isNull() || sBpmEnabled.isEmpty())
-    {
-        config->set(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled"), ConfigValue(1));
-    }
-
-    // Set default value for analyze mode check box
-    int iBpmEnabled = config->getValueString(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled")).toInt();
-    if (iBpmEnabled)
-        chkEnableBpmDetection->setChecked(true);
-    else
-        chkEnableBpmDetection->setChecked(false);
-
-    int iBpmAboveRange = config->getValueString(ConfigKey(CONFIG_KEY,"BPMAboveRangeEnabled")).toInt();
-    if (iBpmAboveRange)
-        chkAboveRange->setChecked(true);
-    else
-        chkAboveRange->setChecked(false);
-
-    // Set default value for detect BPM on import check box
-    int iDetectBpmOnImport = config->getValueString(ConfigKey(CONFIG_KEY,"DetectBPMOnImport")).toInt();
-    if (iDetectBpmOnImport)
-        chkDetectOnImport->setChecked(true);
-    else
-        chkDetectOnImport->setChecked(false);
-
-    // Set default value for write ID3 tag check box
-    int iWriteID3Tag = config->getValueString(ConfigKey(CONFIG_KEY,"WriteID3Tag")).toInt();
-    if (iWriteID3Tag)
-        chkWriteID3->setChecked(true);
-    else
-        chkWriteID3->setChecked(false);
-
-    chkWriteID3->setEnabled(false);
-    chkDetectOnImport->setEnabled(false);
-
-    // Load the BPM schemes
-    loadBpmSchemes();
-    populateBpmSchemeList();
-
-    updateBpmEnabled();
-
-
-    //Load BPM Range Values
-    /*int iRangeStart = config->getValueString(ConfigKey("[BPM]","BPMRangeStart")).toInt();
-    if(iRangeStart > 0 && iRangeStart <= 220)
-        spinBoxBPMRangeStart->setValue(iRangeStart);
-    else
-        spinBoxBPMRangeStart->setValue(60);
-
-    int iRangeEnd = config->getValueString(ConfigKey("[BPM]","BPMRangeEnd")).toInt();
-    if(iRangeEnd > 0 && iRangeEnd <=220)
-        spinBoxBPMRangeEnd->setValue(iRangeEnd);
-    else
-        spinBoxBPMRangeEnd->setValue(180);*/
-
-}
-
-DlgPrefBpm::~DlgPrefBpm()
-{
-    saveBpmSchemes();
-
-    while (!m_BpmSchemes.isEmpty())
-    {
-        delete m_BpmSchemes.takeFirst();
-    }
-}
-
-void DlgPrefBpm::slotSetBpmDetectOnImport(int)
-{
-    if (chkDetectOnImport->isChecked())
-        config->set(ConfigKey(CONFIG_KEY,"DetectBPMOnImport"), ConfigValue(1));
-    else
-        config->set(ConfigKey(CONFIG_KEY,"DetectBPMOnImport"), ConfigValue(0));
-}
-
-void DlgPrefBpm::slotSetWriteID3Tag(int)
-{
-    if (chkWriteID3->isChecked())
-        config->set(ConfigKey(CONFIG_KEY,"WriteID3Tag"), ConfigValue(1));
-    else
-        config->set(ConfigKey(CONFIG_KEY,"WriteID3Tag"), ConfigValue(0));
-}
-
-void DlgPrefBpm::slotSetBpmEnabled(int)
-{
-    if (chkEnableBpmDetection->isChecked())
-        config->set(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled"), ConfigValue(1));
-    else
-        config->set(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled"), ConfigValue(0));
-
-    updateBpmEnabled();
-
-}
-
-void DlgPrefBpm::slotSetAboveRange(int) {
-    if (chkAboveRange->isChecked())
-        config->set(ConfigKey(CONFIG_KEY,"BPMAboveRangeEnabled"), ConfigValue(1));
-    else
-        config->set(ConfigKey(CONFIG_KEY,"BPMAboveRangeEnabled"), ConfigValue(0));
-}
-
-void DlgPrefBpm::slotSetBpmRangeStart(int begin)
-{
-    Q_UNUSED(begin);
-    //config->set(ConfigKey("[BPM]","BPMRangeStart"),ConfigValue(begin));
-}
-
-void DlgPrefBpm::slotSetBpmRangeEnd(int end)
-{
-    Q_UNUSED(end);
-    //config->set(ConfigKey("[BPM]","BPMRangeEnd"),ConfigValue(end));
-}
-
-void DlgPrefBpm::slotEditBpmScheme()
-{
-    int row = lstSchemes->currentRow();
-
-    if(row > -1)
-    {
-        BpmScheme *schemeToEdit = m_BpmSchemes.at(row);
-        QString oldname = schemeToEdit->getName();
-
-        // Open the BPM scheme dialog to edit
-        DlgBpmScheme* SchemeEdit = new DlgBpmScheme(schemeToEdit);
-        SchemeEdit->setModal(true);
-        SchemeEdit->exec();
-
-        QListWidgetItem *item = lstSchemes->item(row);
-        item->setText(schemeToEdit->getName());
-
-        if(oldname == config->getValueString(ConfigKey("[BPM]","DefaultScheme")))
-        {
-            config->set(ConfigKey("[BPM]","DefaultScheme"), schemeToEdit->getName());
-        }
-    }
-}
-
-void DlgPrefBpm::slotAddBpmScheme()
-{
-    BpmScheme *schemeToAdd = NULL;
-
-    // Open the BPM scheme dialog to add
-    DlgBpmScheme* SchemeEdit = new DlgBpmScheme(schemeToAdd);
-    SchemeEdit->setModal(true);
-
-    if(SchemeEdit->exec() == QDialog::Accepted)
-    {
-        if(schemeToAdd)
-        {
-            m_BpmSchemes.push_back(schemeToAdd);
-            QListWidgetItem *addScheme = new QListWidgetItem(lstSchemes);
-            addScheme->setText(schemeToAdd->getName());
-        }
-    }
-    else
-    {
-        delete schemeToAdd;
-    }
-
-
-}
-
-void DlgPrefBpm::slotDeleteBpmScheme()
-{
-    int row = lstSchemes->currentRow();
-
-    if(row > -1)
-    {
-        qDebug() << "Removing Bpm Scheme at position " << row;
-        delete lstSchemes->takeItem(row);
-        m_BpmSchemes.removeAt(row);
-    }
-}
-
-void DlgPrefBpm::slotDefaultBpmScheme()
-{
-    int row = lstSchemes->currentRow();
-
-    if(row > -1)
-    {
-        BpmScheme* scheme = m_BpmSchemes.at(row);
-
-        config->set(ConfigKey("[BPM]","BPMRangeEnd"),ConfigValue(scheme->getMaxBpm()));
-        config->set(ConfigKey("[BPM]","BPMRangeStart"),ConfigValue(scheme->getMinBpm()));
-        config->set(ConfigKey("[BPM]","AnalyzeEntireSong"),ConfigValue(scheme->getAnalyzeEntireSong()));
-        config->set(ConfigKey("[BPM]","DefaultScheme"), scheme->getName());
-
-        clearListIcons();
-
-        QListWidgetItem *item = lstSchemes->item(row);
-        item->setIcon(QIcon(":/images/preferences/ic_preferences_bpmdetect.png"));
-    }
-}
-
-void DlgPrefBpm::clearListIcons()
-{
-    for(int i=0; i < lstSchemes->count(); ++i)
-    {
-        lstSchemes->item(i)->setIcon(QIcon(""));
-    }
-}
-
-void DlgPrefBpm::slotApply()
-{
-    saveBpmSchemes();
-}
-
-void DlgPrefBpm::slotUpdate()
-{
-}
-
-void DlgPrefBpm::updateBpmEnabled()
-{
-    int iBpmEnabled = config->getValueString(ConfigKey(CONFIG_KEY,"BPMDetectionEnabled")).toInt();
-    if (iBpmEnabled)
-    {
-        chkDetectOnImport->setEnabled(true);
-        chkWriteID3->setEnabled(true);
-        chkAboveRange->setEnabled(true);
-        grpBpmSchemes->setEnabled(true);
-    }
-    else
-    {
-        chkDetectOnImport->setEnabled(false);
-        chkWriteID3->setEnabled(false);
-        chkAboveRange->setEnabled(false);
-        grpBpmSchemes->setEnabled(false);
-    }
-
-    // These are not implemented yet, so don't enable them
-    chkDetectOnImport->setEnabled(false);
-    chkWriteID3->setEnabled(false);
-
-}
-
-void DlgPrefBpm::loadBpmSchemes()
-{
-    // Verify path for xml track file.
-    QString schemeFileName = config->getValueString(ConfigKey("[BPM]","SchemeFile"));
-    if (schemeFileName.trimmed().isEmpty() | !QFile(schemeFileName).exists() ) {
-        schemeFileName = CmdlineArgs::Instance().getSettingsPath() + BPMSCHEME_FILE;
-        qDebug() << "BPM Scheme File ConfigKey not set or file missing... setting to"<< schemeFileName;
-        config->set(ConfigKey("[BPM]","SchemeFile"), schemeFileName);
-        config->Save();
-    }
-
-    QString location(config->getValueString(ConfigKey("[BPM]","SchemeFile")));
-    qDebug() << "BpmSchemes::readXML" << location;
-
-    // Open XML file
-    QFile file(location);
-
-    // Check if we can open the file
-    if (!file.exists())
-    {
-        qDebug() << "BPM Scheme:" << location <<  "does not exist.";
-        file.close();
-        return;
-    }
-
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug() << "BPM Scheme:" << location <<  "can't open file for reading.";
-        return;
-    }
-
-    QByteArray fileData = file.readAll();
-    QByteArray badHeader = QByteArray("<?xml version=\"1.0\" encoding=\"UTF-16\"?>");
-    QByteArray goodHeader = QByteArray("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-
-    // We've been writing UTF-16 as the encoding forever but actually writing
-    // the file in UTF-8 (well, latin1 actually). Qt seems to have started
-    // caring recently. Manually fix the header if we are dealing with an old
-    // file.
-    fileData.replace(badHeader, goodHeader);
-
-    QDomDocument domXML("Mixxx_BPM_Scheme_List");
-
-
-
-    // Check if there is a parsing problem
-    QString error_msg;
-    int error_line;
-    int error_column;
-    if (!domXML.setContent(fileData, &error_msg, &error_line, &error_column))
-    {
-        qDebug() << "BPM Scheme Parse error in" << location;
-        qDebug() << "Doctype:" << domXML.doctype().name();
-        qDebug() << error_msg << "on line" << error_line << ", column" << error_column;
-        file.close();
-        return;
-    }
-
-    file.close();
-
-    // Get the root element
-    QDomElement elementRoot = domXML.documentElement();
-
-    // Get version
-    //int version = XmlParse::selectNodeInt(elementRoot, "Version");
-
-    // Get all the BPM schemes written in the xml file:
-    QDomNode node = XmlParse::selectNode(elementRoot, "Schemes").firstChild();
-    BpmScheme* bpmScheme; //Current BPM Scheme
-    while (!node.isNull())
-    {
-        if (node.isElement() && node.nodeName()=="Scheme")
-        {
-            bpmScheme = new BpmScheme();
-            //Create the playlists internally.
-            //If the playlist is "Library" or "Play Queue", insert it into
-            //a special spot in the list of playlists.
-            bpmScheme->setName(XmlParse::selectNodeQString(node, "Name"));
-            bpmScheme->setMinBpm(XmlParse::selectNodeQString(node, "MinBpm").toInt());
-            bpmScheme->setMaxBpm(XmlParse::selectNodeQString(node, "MaxBpm").toInt());
-            bpmScheme->setAnalyzeEntireSong((bool)XmlParse::selectNodeQString(node,
-                                                        "AnalyzeEntireSong").toInt());
-            bpmScheme->setComment(XmlParse::selectNodeQString(node, "Comment"));
-
-            m_BpmSchemes.push_back(bpmScheme);
-        }
-
-        node = node.nextSibling();
-    }
-
-    if(m_BpmSchemes.size() == 0)
-    {
-        BpmScheme *scheme = new BpmScheme("Default", 70, 140, false);
-        m_BpmSchemes.push_back(scheme);
-        config->set(ConfigKey("[BPM]","DefaultScheme"), QString("Default"));
-        config->set(ConfigKey("[BPM]","BPMRangeEnd"),ConfigValue(scheme->getMaxBpm()));
-        config->set(ConfigKey("[BPM]","BPMRangeStart"),ConfigValue(scheme->getMinBpm()));
-        config->set(ConfigKey("[BPM]","AnalyzeEntireSong"),ConfigValue(scheme->getAnalyzeEntireSong()));
-    }
-}
-
-void DlgPrefBpm::saveBpmSchemes()
-{
-    QString location(config->getValueString(ConfigKey("[BPM]","SchemeFile")));
-
-    // Create the xml document:
-    QDomDocument domXML( "Mixxx_BPM_Scheme_List" );
-
-    // Ensure UTF16 encoding
-    domXML.appendChild(domXML.createProcessingInstruction("xml","version=\"1.0\" encoding=\"UTF-8\""));
-
-    // Set the document type
-    QDomElement elementRoot = domXML.createElement( "Mixxx_BPM_Scheme_List" );
-    domXML.appendChild(elementRoot);
-
-    // Add version information:
-    //XmlParse::addElement(domXML, elementRoot, "Version", QString("%1").arg(TRACK_VERSION));
-
-    // Write playlists
-    QDomElement schemesroot = domXML.createElement("Schemes");
-
-    QListIterator<BpmScheme*> it(m_BpmSchemes);
-    BpmScheme* current;
-    while (it.hasNext())
-    {
-        current = it.next();
-
-        QDomElement elementNew = domXML.createElement("Scheme");
-        current->writeXML(domXML, elementNew);
-        schemesroot.appendChild(elementNew);
-
-    }
-    elementRoot.appendChild(schemesroot);
-
-    // Open the file:
-    QFile opmlFile(location);
-    if (!opmlFile.open(QIODevice::WriteOnly))
-    {
-        QMessageBox::critical(0,
-                              tr("Error"),
-                              tr("Cannot open file %1").arg(location));
-        return;
-    }
-    // QByteArray encoded in UTF-8
-    QByteArray ba = domXML.toByteArray();
-    opmlFile.write(ba.constData(), ba.size());
-    opmlFile.close();
-}
-
-void DlgPrefBpm::populateBpmSchemeList()
-{
-    QString defaultscheme = config->getValueString(ConfigKey("[BPM]","DefaultScheme"));
-
-    for(int i=0; i < m_BpmSchemes.size(); ++i)
-    {
-        QListWidgetItem* scheme = new QListWidgetItem(lstSchemes);
-        scheme->setText(m_BpmSchemes.at(i)->getName());
-        if(m_BpmSchemes.at(i)->getName() == defaultscheme)
-        {
-            scheme->setIcon(QIcon(":/images/preferences/ic_preferences_bpmdetect.png"));
-        }
-    }
-}

=== removed file 'mixxx/src/dlgprefbpm.h'
--- mixxx/src/dlgprefbpm.h	2008-05-11 15:27:38 +0000
+++ mixxx/src/dlgprefbpm.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-
-
-/***************************************************************************
- *                                                                         *
- *   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 DLGPREFBPM_H
-#define DLGPREFBPM_H
-
-#include "ui_dlgprefbpmdlg.h"
-#include "configobject.h"
-
-#include <qlist.h>
-
-class QWidget;
-class BpmScheme;
-
-class DlgPrefBpm : public QWidget, Ui::DlgPrefBPMDlg  {
-    Q_OBJECT
-public:
-    DlgPrefBpm(QWidget *parent, ConfigObject<ConfigValue> *_config);
-    ~DlgPrefBpm();
-public slots:
-
-    void slotSetBpmDetectOnImport(int);
-    void slotSetWriteID3Tag(int);
-    void slotSetBpmEnabled(int);
-    void slotSetBpmRangeStart(int);
-    void slotSetBpmRangeEnd(int);
-    void slotSetAboveRange(int);
-   
-    void slotEditBpmScheme();
-    void slotAddBpmScheme();
-    void slotDeleteBpmScheme();
-    void slotDefaultBpmScheme();
-
-     /** Apply changes to widget */
-    void slotApply();
-    void slotUpdate();
-signals:
-    void apply(const QString &);
-private:
-
-    void clearListIcons();
-
-    // Determines whether or not to gray out the preferences
-    void updateBpmEnabled();
-
-    // Private methods for loading and saving the BPM schemes
-    // to and from the file system.
-    void loadBpmSchemes();
-    void saveBpmSchemes();
-    
-    // Method for filling in the list of BPM schemes on the dialog
-    void populateBpmSchemeList();
-
-      /** Pointer to config object */
-    ConfigObject<ConfigValue> *config;
-    QList<BpmScheme*> m_BpmSchemes;
-};
-
-#endif

=== removed file 'mixxx/src/dlgprefbpmdlg.ui'
--- mixxx/src/dlgprefbpmdlg.ui	2012-04-30 18:38:29 +0000
+++ mixxx/src/dlgprefbpmdlg.ui	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgPrefBPMDlg</class>
- <widget class="QWidget" name="DlgPrefBPMDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>433</width>
-    <height>446</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>BPM Detection Settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>BPM Detection</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="chkEnableBpmDetection">
-        <property name="text">
-         <string>Enable BPM Detection</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="Line" name="line1">
-        <property name="frameShape">
-         <enum>QFrame::HLine</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="chkDetectOnImport">
-        <property name="text">
-         <string>Detect Tracks BPM on Import</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="chkWriteID3">
-        <property name="text">
-         <string>Write BPM to ID3 Tag</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="chkAboveRange">
-        <property name="toolTip">
-         <string>If BPM can be detected but not within specified range</string>
-        </property>
-        <property name="text">
-         <string>Allow BPM above the range</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="grpBpmSchemes">
-     <property name="minimumSize">
-      <size>
-       <width>409</width>
-       <height>200</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>BPM Schemes</string>
-     </property>
-     <layout class="QGridLayout">
-      <item row="4" column="1">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0" rowspan="5">
-       <widget class="QListWidget" name="lstSchemes">
-        <property name="showDropIndicator" stdset="0">
-         <bool>false</bool>
-        </property>
-        <property name="dragDropMode">
-         <enum>QAbstractItemView::NoDragDrop</enum>
-        </property>
-        <property name="modelColumn">
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="btnAdd">
-        <property name="text">
-         <string>Add</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="btnEdit">
-        <property name="text">
-         <string>Edit</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="btnDelete">
-        <property name="text">
-         <string>Delete</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="btnDefault">
-        <property name="text">
-         <string>Default</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>

=== modified file 'mixxx/src/dlgprefeq.cpp'
--- mixxx/src/dlgprefeq.cpp	2012-04-29 15:54:21 +0000
+++ mixxx/src/dlgprefeq.cpp	2013-05-16 01:44:29 +0000
@@ -15,8 +15,6 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "dlgprefeq.h"
-#include "engine/enginefilteriir.h"
 #include <qlineedit.h>
 #include <qwidget.h>
 #include <qslider.h>
@@ -28,6 +26,10 @@
 
 #include <assert.h>
 
+#include "dlgprefeq.h"
+#include "engine/enginefilteriir.h"
+#include "controlobject.h"
+
 #define CONFIG_KEY "[Mixer Profile]"
 
 const int kFrequencyUpperLimit = 20050;

=== modified file 'mixxx/src/dlgprefeq.h'
--- mixxx/src/dlgprefeq.h	2011-12-06 19:40:07 +0000
+++ mixxx/src/dlgprefeq.h	2013-05-16 01:44:29 +0000
@@ -21,7 +21,7 @@
 #include "ui_dlgprefeqdlg.h"
 #include "configobject.h"
 #include "engine/enginefilterblock.h"
-#include "controlobject.h"
+#include "controlobjectthread.h"
 
 class QWidget;
 /**

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2013-03-14 18:29:16 +0000
+++ mixxx/src/dlgpreferences.cpp	2013-05-16 01:44:29 +0000
@@ -31,11 +31,7 @@
 #ifdef __SHOUTCAST__
 #include "dlgprefshoutcast.h"
 #endif
-#ifdef __VAMP__
-    #include "dlgprefbeats.h"
-#else
-    #include "dlgprefbpm.h"
-#endif
+#include "dlgprefbeats.h"
 
 #ifdef __MODPLUG__
     #include "dlgprefmodplug.h"
@@ -91,13 +87,8 @@
     m_wcrossfader = new DlgPrefCrossfader(this, config);
     addPageWidget(m_wcrossfader);
 
-#ifdef __VAMP__
     m_wbeats = new DlgPrefBeats(this, config);
     addPageWidget (m_wbeats);
-#else
-    m_wbpm = new DlgPrefBpm(this, config);
-    addPageWidget(m_wbpm);
-#endif
     m_wreplaygain = new DlgPrefReplayGain(this, config);
     addPageWidget(m_wreplaygain);
     m_wrecord = new DlgPrefRecord(this, config);
@@ -139,13 +130,8 @@
     connect(this, SIGNAL(showDlg()), m_weq,        SLOT(slotUpdate()));
     connect(this, SIGNAL(showDlg()), m_wcrossfader, SLOT(slotUpdate()));
 
-#ifdef __VAMP__
     connect(this, SIGNAL(showDlg()),
             m_wbeats, SLOT(slotUpdate()));
-#else
-    connect(this, SIGNAL(showDlg()),
-            m_wbpm, SLOT(slotUpdate()));
-#endif
 
     connect(this, SIGNAL(showDlg()), m_wreplaygain,SLOT(slotUpdate()));
     connect(this, SIGNAL(showDlg()), m_wrecord,    SLOT(slotUpdate()));
@@ -175,11 +161,7 @@
     connect(buttonBox, SIGNAL(accepted()), m_wcrossfader,SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()), this,      SLOT(slotApply()));
 
-#ifdef __VAMP__
     connect(buttonBox, SIGNAL(accepted()), m_wbeats,      SLOT(slotApply()));
-#else
-    connect(buttonBox, SIGNAL(accepted()), m_wbpm,      SLOT(slotApply()));
-#endif
     connect(buttonBox, SIGNAL(accepted()), m_wreplaygain,SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()), m_wrecord,   SLOT(slotApply()));
 #ifdef __SHOUTCAST__
@@ -247,19 +229,11 @@
     m_pRecordingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
 
-#ifdef __VAMP__
     m_pAnalysersButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
     m_pAnalysersButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_bpmdetect.png"));
     m_pAnalysersButton->setText(0, tr("Beat Detection"));
     m_pAnalysersButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pAnalysersButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-#else
-    m_pBPMdetectButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
-    m_pBPMdetectButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_bpmdetect.png"));
-    m_pBPMdetectButton->setText(0, tr("BPM Detection"));
-    m_pBPMdetectButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
-    m_pBPMdetectButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-#endif
     m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
     m_pReplayGainButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_replaygain.png"));
     m_pReplayGainButton->setText(0, tr("Normalization"));
@@ -323,14 +297,8 @@
     	pagesWidget->setCurrentWidget(m_wcrossfader->parentWidget()->parentWidget());
     } else if (current == m_pRecordingButton) {
     	pagesWidget->setCurrentWidget(m_wrecord->parentWidget()->parentWidget());
-
-#ifdef __VAMP__
     } else if (current == m_pAnalysersButton ) {
         pagesWidget->setCurrentWidget(m_wbeats->parentWidget()->parentWidget());
-#else
-    } else if (current == m_pBPMdetectButton) {
-        pagesWidget->setCurrentWidget(m_wbpm->parentWidget()->parentWidget());
-#endif
     } else if (current == m_pReplayGainButton) {
     	pagesWidget->setCurrentWidget(m_wreplaygain->parentWidget()->parentWidget());
 

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2013-03-14 17:43:39 +0000
+++ mixxx/src/dlgpreferences.h	2013-05-16 01:44:29 +0000
@@ -35,7 +35,6 @@
 class DlgPrefEQ;
 class DlgPrefCrossfader;
 class DlgPrefRecord;
-class DlgPrefBpm;
 class DlgPrefBeats;
 class DlgPrefVinyl;
 class DlgPrefNoVinyl;
@@ -90,7 +89,6 @@
     DlgPrefEQ* m_weq;
     DlgPrefCrossfader* m_wcrossfader;
     DlgPrefRecord* m_wrecord;
-    DlgPrefBpm* m_wbpm;
     DlgPrefBeats* m_wbeats;
     DlgPrefVinyl* m_wvinylcontrol;
     DlgPrefNoVinyl* m_wnovinylcontrol;

=== modified file 'mixxx/src/dlgprefrecord.cpp'
--- mixxx/src/dlgprefrecord.cpp	2012-06-15 20:49:49 +0000
+++ mixxx/src/dlgprefrecord.cpp	2013-05-16 01:44:29 +0000
@@ -17,12 +17,12 @@
 
 #include <QtCore>
 #include <QtGui>
+
 #include "dlgprefrecord.h"
 #include "recording/defs_recording.h"
 #include "controlobject.h"
 #include "controlobjectthreadmain.h"
-#include "recording/encoder.h"
-
+#include "encoder/encoder.h"
 
 DlgPrefRecord::DlgPrefRecord(QWidget * parent, ConfigObject<ConfigValue> * _config)
         : QWidget(parent) {
@@ -39,12 +39,11 @@
     recordControl = new ControlObjectThreadMain(
         ControlObject::getControl(ConfigKey(RECORDING_PREF_KEY, "status")));
 
-#ifdef __SHOUTCAST__
     radioOgg = new QRadioButton("Ogg Vorbis");
     radioMp3 = new QRadioButton(ENCODING_MP3);
 
     // Setting recordings path
-    QString recordingsPath = config->getValueString(ConfigKey("[Recording]","Directory"));
+    QString recordingsPath = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory"));
     if (recordingsPath == "") {
         // Initialize recordings path in config to old default path.
         // Do it here so we show current value in UI correctly.
@@ -67,8 +66,6 @@
     horizontalLayout->addWidget(radioOgg);
     horizontalLayout->addWidget(radioMp3);
 
-#endif
-
     //AIFF and WAVE are supported by default
     radioWav = new QRadioButton(ENCODING_WAVE);
     connect(radioWav, SIGNAL(clicked()),
@@ -80,7 +77,6 @@
             this, SLOT(slotApply()));
     horizontalLayout->addWidget(radioAiff);
 
-
 #ifdef SF_FORMAT_FLAC
     radioFlac = new QRadioButton(ENCODING_FLAC);
     connect(radioFlac,SIGNAL(clicked()),
@@ -89,18 +85,18 @@
 #endif
 
     //Read config and check radio button
-    QString format = config->getValueString(ConfigKey("[Recording]","Encoding"));
+    QString format = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Encoding"));
     if(format == ENCODING_WAVE)
         radioWav->setChecked(true);
-#ifdef __SHOUTCAST__
     else if(format == ENCODING_OGG)
         radioOgg->setChecked(true);
     else if (format == ENCODING_MP3)
         radioMp3->setChecked(true);
-#endif
-#ifdef SF_FORMAT_FLAC
     else if (format == ENCODING_AIFF)
         radioAiff->setChecked(true);
+#ifdef SF_FORMAT_FLAC
+    else if (format == ENCODING_FLAC)
+        radioFlac->setChecked(true);
 #endif
     else //Invalid, so set default and save
     {
@@ -109,6 +105,8 @@
         config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_WAVE));
     }
 
+    loadMetaData();
+
     //Connections
     connect(SliderQuality,    SIGNAL(valueChanged(int)), this,  SLOT(slotSliderQuality()));
     connect(SliderQuality,    SIGNAL(sliderMoved(int)), this,   SLOT(slotSliderQuality()));
@@ -125,7 +123,7 @@
     comboBoxSplitting->addItem(SPLIT_2048MB);
     comboBoxSplitting->addItem(SPLIT_4096MB);
 
-    QString fileSizeStr = config->getValueString(ConfigKey("[Recording]","FileSize"));
+    QString fileSizeStr = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"FileSize"));
     int index = comboBoxSplitting->findText(fileSizeStr);
     if(index > 0){
         //set file split size
@@ -134,7 +132,7 @@
     //Otherwise 650 MB will be default file split size
 
     //Read CUEfile info
-    CheckBoxRecordCueFile->setChecked((bool) config->getValueString(ConfigKey("[Recording]","CueEnabled")).toInt());
+    CheckBoxRecordCueFile->setChecked((bool) config->getValueString(ConfigKey(RECORDING_PREF_KEY,"CueEnabled")).toInt());
 
 }
 
@@ -243,7 +241,7 @@
 void DlgPrefRecord::slotUpdate()
 {
     // Recordings path
-    QString recordingsPath = config->getValueString(ConfigKey("[Recording]","Directory"));
+    QString recordingsPath = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory"));
     LineEditRecordings->setText(recordingsPath);
 
     if (radioWav && radioWav->isChecked())
@@ -272,7 +270,7 @@
 void DlgPrefRecord::slotBrowseRecordingsDir()
 {
     QString fd = QFileDialog::getExistingDirectory(this, tr("Choose recordings directory"),
-                                                   config->getValueString(ConfigKey("[Recording]","Directory")));
+                                                   config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory")));
     if (fd != "")
     {
         LineEditRecordings->setText(fd);
@@ -293,10 +291,10 @@
         qDebug() << "Recordings path was empty in dialog";
         return;
     }
-    if (LineEditRecordings->text() != config->getValueString(ConfigKey("[Recording]","Directory")))
+    if (LineEditRecordings->text() != config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory")))
     {
         qDebug() << "Saved recordings path" << LineEditRecordings->text();
-        config->set(ConfigKey("[Recording]","Directory"), LineEditRecordings->text());
+        config->set(ConfigKey(RECORDING_PREF_KEY,"Directory"), LineEditRecordings->text());
     }
 }
 

=== modified file 'mixxx/src/dlgprefshoutcast.h'
--- mixxx/src/dlgprefshoutcast.h	2008-01-26 19:29:41 +0000
+++ mixxx/src/dlgprefshoutcast.h	2013-05-16 01:44:29 +0000
@@ -5,7 +5,7 @@
     copyright            : (C) 2008 by Wesley Stessens
                            (C) 2007 by John Sully
                            (C) 2008 by Albert Santoni
-    email                : 
+    email                :
  ***************************************************************************/
 
 /***************************************************************************
@@ -24,9 +24,7 @@
 #include "controlobject.h"
 #include "configobject.h"
 #include "controlobjectthreadmain.h"
-
-#define SHOUTCAST_PREF_KEY "[Shoutcast]"
-#define SHOUTCAST_DEFAULT_PORT "8000"
+#include "shoutcast/defs_shoutcast.h"
 
 class QWidget;
 /**
@@ -35,7 +33,7 @@
 
 class DlgPrefShoutcast : public QWidget, public Ui::DlgPrefShoutcastDlg  {
     Q_OBJECT
-public: 
+public:
     DlgPrefShoutcast(QWidget *parent, ConfigObject<ConfigValue> *_config);
     ~DlgPrefShoutcast();
 public slots:

=== modified file 'mixxx/src/dlgtrackinfo.h'
--- mixxx/src/dlgtrackinfo.h	2010-09-10 06:04:12 +0000
+++ mixxx/src/dlgtrackinfo.h	2013-05-16 01:44:29 +0000
@@ -10,7 +10,15 @@
 #include "ui_dlgtrackinfo.h"
 
 #include "trackinfoobject.h"
-#include "controlbeat.h"
+
+/** Minimum allowed Beat per minute (BPM) */
+const int minBPM = 30;
+/** Maximum allowed bpm */
+const int maxBPM = 240;
+/** Maximum allowed interval between beats in milli seconds (calculated from minBPM) */
+const int maxInterval = (int)(1000.*(60./(CSAMPLE)minBPM));
+/** Filter length */
+const int filterLength = 5;
 
 class Cue;
 

=== added directory 'mixxx/src/encoder'
=== renamed file 'mixxx/src/recording/encoder.cpp' => 'mixxx/src/encoder/encoder.cpp'
--- mixxx/src/recording/encoder.cpp	2010-11-01 17:24:48 +0000
+++ mixxx/src/encoder/encoder.cpp	2013-05-16 01:44:29 +0000
@@ -14,24 +14,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h> // needed for random num gen
-#include <time.h> // needed for random num gen
-#include <string.h> // needed for memcpy
-#include <QDebug>
-
-#include "engine/engineabstractrecord.h"
-#include "controlobjectthreadmain.h"
-#include "controlobject.h"
-#include "playerinfo.h"
-#include "trackinfoobject.h"
-
-#include "encoder.h"
-
-// Constructor
+#include "encoder/encoder.h"
+
 Encoder::Encoder() {
 }
 
-// Destructor
 Encoder::~Encoder() {
 }
 

=== renamed file 'mixxx/src/recording/encoder.h' => 'mixxx/src/encoder/encoder.h'
--- mixxx/src/recording/encoder.h	2010-09-07 07:50:15 +0000
+++ mixxx/src/encoder/encoder.h	2013-05-16 01:44:29 +0000
@@ -17,30 +17,20 @@
 #ifndef ENCODER_H
 #define ENCODER_H
 
-#include <stdlib.h> // needed for random num gen
-#include <time.h> // needed for random num gen
-#include <string.h> // needed for memcpy
-#include <QDebug>
-
-#include "engine/engineabstractrecord.h"
-#include "controlobjectthreadmain.h"
-#include "controlobject.h"
-#include "playerinfo.h"
-#include "trackinfoobject.h"
-
-
-class Encoder : public QObject {
-    Q_OBJECT
-
+#include "defs.h"
+
+class Encoder {
   public:
     Encoder();
     virtual ~Encoder();
-    /*
-     * General Encoder methods
-     */
-    virtual int initEncoder(int bitrate) = 0;
+
+    virtual int initEncoder(int bitrate, int samplerate) = 0;
+    // encodes the provided buffer of audio.
     virtual void encodeBuffer(const CSAMPLE *samples, const int size) = 0;
+    // Adds metadata to the encoded auio, i.e., the ID3 tag. Currently only used
+    // by EngineRecord, EngineShoutcast does something different.
     virtual void updateMetaData(char* artist, char* title, char* album) = 0;
+    // called at the end when encoding is finished
     virtual void flush() = 0;
     /**converts an OGG quality measure from 1..10 to a bitrate **/
     static int convertToBitrate(int quality);

=== renamed file 'mixxx/src/engine/engineabstractrecord.h' => 'mixxx/src/encoder/encodercallback.h'
--- mixxx/src/engine/engineabstractrecord.h	2011-03-22 16:24:04 +0000
+++ mixxx/src/encoder/encodercallback.h	2013-05-16 01:44:29 +0000
@@ -1,29 +1,12 @@
-/***************************************************************************
-               engineabstractrecord.h  -  Abstract Recording class
-                             -------------------
-    copyright            : (C) 2007 by Wesley Stessens
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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 ENGINEABSTRACTRECORD_H
-#define ENGINEABSTRACTRECORD_H
-
-#include "defs.h"
-#include "engine/engineobject.h"
-
-class EngineAbstractRecord : public EngineObject {
+#ifndef ENCODERCALLBACK_H
+#define ENCODERCALLBACK_H
+
+class EncoderCallback {
   public:
-    /** writes to encoded audio to a stream, e.g., a file stream or shoutcast stream **/
+    // writes to encoded audio to a stream, e.g., a file stream or shoutcast stream
     virtual void write(unsigned char *header, unsigned char *body,
-                           int headerLen, int bodyLen) = 0;
+                       int headerLen, int bodyLen) = 0;
 };
 
-#endif
+#endif /* ENCODERCALLBACK_H */
+

=== renamed file 'mixxx/src/recording/encodermp3.cpp' => 'mixxx/src/encoder/encodermp3.cpp'
--- mixxx/src/recording/encodermp3.cpp	2012-05-14 20:47:43 +0000
+++ mixxx/src/encoder/encodermp3.cpp	2013-05-16 01:44:29 +0000
@@ -15,53 +15,20 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h> // needed for random num
-#include <time.h> // needed for random num
-#include <string.h> // needed for memcpy
-#include <QDebug>
+#include <QtDebug>
+#include <QObject>
 
-#include "recording/encodermp3.h"
-#include "engine/engineabstractrecord.h"
-#include "controlobjectthreadmain.h"
-#include "controlobject.h"
-#include "playerinfo.h"
-#include "trackinfoobject.h"
-#include "defs_recording.h"
+#include "encoder/encodermp3.h"
+#include "encoder/encodercallback.h"
 #include "errordialoghandler.h"
 
-EncoderMp3::EncoderMp3(EngineAbstractRecord *engine) {
-    m_pEngine = engine;
-    m_metaDataTitle = NULL;
-    m_metaDataArtist = NULL;
-    m_metaDataAlbum = NULL;
-    m_pMetaData = TrackPointer(NULL);
-    m_bufferIn[0] = NULL;
-    m_bufferIn[1] = NULL;
-    m_bufferOut = NULL;
-    m_bufferOutSize = 0;
-    m_lameFlags = NULL;
-    m_library = NULL;
-    m_samplerate = NULL;
-
-    //These are the function pointers for lame
-    lame_init =  0;
-    lame_set_num_channels = 0;
-    lame_set_in_samplerate =  0;
-    lame_set_out_samplerate = 0;
-    lame_close = 0;
-    lame_set_brate = 0;
-    lame_set_mode = 0;
-    lame_set_quality = 0;
-    lame_set_bWriteVbrTag = 0;
-    lame_encode_buffer_float = 0;
-    lame_init_params = 0;
-    lame_encode_flush = 0;
-
-    id3tag_init= 0;
-    id3tag_set_title = 0;
-    id3tag_set_artist = 0;
-    id3tag_set_album = 0;
-
+EncoderMp3::EncoderMp3(EncoderCallback* pCallback)
+  : m_lameFlags(NULL),
+    m_metaDataTitle(NULL),
+    m_metaDataArtist(NULL),
+    m_metaDataAlbum(NULL),
+    m_bufferOut(NULL),
+    m_bufferOutSize(0),
     /*
      * @ Author: Tobias Rafreider
      * Nobody has initialized the field before my code review.  At runtime the
@@ -78,7 +45,30 @@
      * along with LAME.  This bug was detected by using Valgrind memory analyser
      *
      */
-    m_bufferInSize = 0;
+    m_bufferInSize(0),
+    m_pCallback(pCallback),
+    m_library(NULL) {
+    m_bufferIn[0] = NULL;
+    m_bufferIn[1] = NULL;
+
+    //These are the function pointers for lame
+    lame_init =  0;
+    lame_set_num_channels = 0;
+    lame_set_in_samplerate =  0;
+    lame_set_out_samplerate = 0;
+    lame_close = 0;
+    lame_set_brate = 0;
+    lame_set_mode = 0;
+    lame_set_quality = 0;
+    lame_set_bWriteVbrTag = 0;
+    lame_encode_buffer_float = 0;
+    lame_init_params = 0;
+    lame_encode_flush = 0;
+
+    id3tag_init= 0;
+    id3tag_set_title = 0;
+    id3tag_set_artist = 0;
+    id3tag_set_album = 0;
 
     /*
      * Load shared library
@@ -86,7 +76,7 @@
     QStringList libnames;
     QString libname = "";
 #ifdef __LINUX__
-       libnames << "mp3lame";
+    libnames << "mp3lame";
 #elif __WINDOWS__
     libnames << "lame_enc.dll";
 #elif __APPLE__
@@ -103,22 +93,21 @@
         m_library = NULL;
     }