Changes in trunk won't go out until after 1.10, should this be retargeted at
LP:mixxx/1.10?
Bill

On Jul 30, 2011 3:21 PM, "Owen Williams" <email address hidden> wrote:
>
> Owen Williams has proposed merging lp:~ywwg/mixxx/features_xwax2 into
lp:mixxx.
>
> Requested reviews:
>  RJ Ryan (rryan)
> Related bugs:
>  Bug #528113 in Mixxx: "Vinyl control signal quality doesn't refresh"
>  https://bugs.launchpad.net/mixxx/+bug/528113
>  Bug #624925 in Mixxx: "Mixxx should switch to relative mode if looping is
enabled in absolute mode"
>  https://bugs.launchpad.net/mixxx/+bug/624925
>  Bug #624931 in Mixxx: "Scale BPM display does not work for vinyl control
in Mixxx 1.8 and below"
>  https://bugs.launchpad.net/mixxx/+bug/624931
>  Bug #669289 in Mixxx: "Enable needle cueing in relative mode"
>  https://bugs.launchpad.net/mixxx/+bug/669289
>  Bug #672758 in Mixxx: "Support 45 rpm vinyl mode"
>  https://bugs.launchpad.net/mixxx/+bug/672758
>
> For more details, see:
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/69904
>
> I've continued working in features_xwax2 to make some fixes and updates to
the vinyl control code.  It would be nice if some of these fixes could go
into trunk, other new features can probably wait if it breaks freeze too
badly.
>
> New Features:
> * Show signal quality inside WSpinny
> * More pleasant waveform stretching
>
> Fixes:
> * fix vinylsoundemu and take equivalent code out of EBSL
> * when loading a track, update track duration with correct value
> * keep vinyl control enabled when changing vinyl control preferences
> * Absolute mode fixes (better for scratching)
> --
> https://code.launchpad.net/~ywwg/mixxx/features_xwax2/+merge/69904
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>
> === modified file 'mixxx/lib/xwax/timecoder.c'
> --- mixxx/lib/xwax/timecoder.c  2011-05-25 19:52:14 +0000
> +++ mixxx/lib/xwax/timecoder.c  2011-07-30 20:21:03 +0000
> @@ -519,7 +519,7 @@
>
>         if (r >= 0) {
>                //normalize position to milliseconds, not timecode steps --
Owen
> -               r = r * 1000 / (tc->def->resolution * tc->speed);
> +               r = (float)r * (1000.0 / (tc->def->resolution *
tc->speed));
>             if (when)
>                 *when = tc->timecode_ticker * tc->dt;
>             return r;
>
> === modified file 'mixxx/lib/xwax/timecoder_win32.cpp'
> --- mixxx/lib/xwax/timecoder_win32.cpp  2011-05-25 19:52:14 +0000
> +++ mixxx/lib/xwax/timecoder_win32.cpp  2011-07-30 20:21:03 +0000
> @@ -521,7 +521,7 @@
>
>         if (r >= 0) {
>                //normalize position to milliseconds, not timecode steps --
Owen
> -               r = r * 1000 / (tc->def->resolution * tc->speed);
> +               r = (float)r * (1000.0 / (tc->def->resolution *
tc->speed));
>             if (when)
>                 *when = tc->timecode_ticker * tc->dt;
>             return r;
>
> === modified file 'mixxx/src/dlgprefnovinyldlg.ui'
> --- mixxx/src/dlgprefnovinyldlg.ui      2011-05-26 10:22:03 +0000
> +++ mixxx/src/dlgprefnovinyldlg.ui      2011-07-30 20:21:03 +0000
> @@ -9,8 +9,13 @@
>    <rect>
>     <x>0</x>
>     <y>0</y>
> +<<<<<<< TREE
>     <width>461</width>
>     <height>527</height>
> +=======
> +    <width>504</width>
> +    <height>501</height>
> +>>>>>>> MERGE-SOURCE
>    </rect>
>   </property>
>   <property name="windowTitle">
> @@ -317,6 +322,13 @@
>         </property>
>        </spacer>
>       </item>
> +      <item row="3" column="0" colspan="3">
> +       <widget class="QCheckBox" name="SignalQualityEnable">
> +        <property name="text">
> +         <string>Show Signal Quality in Skin</string>
> +        </property>
> +       </widget>
> +      </item>
>      </layout>
>     </widget>
>    </item>
> @@ -406,9 +418,26 @@
>         </property>
>        </spacer>
>       </item>
> +      <item row="1" column="0">
> +       <widget class="QLabel" name="label">
> +        <property name="enabled">
> +         <bool>false</bool>
> +        </property>
> +        <property name="toolTip">
> +         <string>http://www.xwax.co.uk</string>
> +        </property>
> +        <property name="text">
> +         <string>Powered by xwax</string>
> +        </property>
> +        <property name="alignment">
> +         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
> +        </property>
> +       </widget>
> +      </item>
>      </layout>
>     </widget>
>    </item>
> +<<<<<<< TREE
>    <item row="6" column="0" colspan="2">
>     <widget class="QLabel" name="label_3">
>      <property name="text">
> @@ -458,6 +487,9 @@
>     </widget>
>    </item>
>    <item row="6" column="2" rowspan="2">
> +=======
> +   <item row="6" column="2">
> +>>>>>>> MERGE-SOURCE
>     <spacer name="verticalSpacer">
>      <property name="orientation">
>       <enum>Qt::Vertical</enum>
> @@ -470,6 +502,41 @@
>      </property>
>     </spacer>
>    </item>
> +<<<<<<< TREE
> +=======
> +   <item row="5" column="2">
> +    <widget class="QPushButton" name="applyButton">
> +     <property name="enabled">
> +      <bool>false</bool>
> +     </property>
> +     <property name="sizePolicy">
> +      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
> +       <horstretch>0</horstretch>
> +       <verstretch>0</verstretch>
> +      </sizepolicy>
> +     </property>
> +     <property name="sizeHint" stdset="0">
> +      <size>
> +       <width>85</width>
> +       <height>27</height>
> +      </size>
> +     </property>
> +     <property name="text">
> +      <string>Apply</string>
> +     </property>
> +    </widget>
> +   </item>
> +   <item row="5" column="0" colspan="2">
> +    <widget class="QLabel" name="label_3">
> +     <property name="text">
> +      <string>&lt;b&gt;This version of Mixxx does not support vinyl
control.&lt;/b&gt; &lt;br&gt; Please visit &lt;a
href=&quot;http://mixxx.org&quot;&gt;Mixxx.org&lt;/a&gt;
for more information.</string>
> +     </property>
> +     <property name="wordWrap">
> +      <bool>true</bool>
> +     </property>
> +    </widget>
> +   </item>
> +>>>>>>> MERGE-SOURCE
>   </layout>
>  </widget>
>  <layoutdefault spacing="6" margin="11"/>
>
> === modified file 'mixxx/src/dlgprefvinyl.cpp'
> --- mixxx/src/dlgprefvinyl.cpp  2011-05-11 04:38:17 +0000
> +++ mixxx/src/dlgprefvinyl.cpp  2011-07-30 20:21:03 +0000
> @@ -137,6 +137,8 @@
>
>     // Honour the Needle Skip Prevention setting.
>     NeedleSkipEnable->setChecked( (bool)config->getValueString(
ConfigKey("[VinylControl]", "needle_skip_prevention") ).toInt() );
> +
> +
 SignalQualityEnable->setChecked((bool)config->getValueString(ConfigKey("[VinylControl]",
"show_signal_quality") ).toInt() );
>
>     //set vinyl control gain
>     VinylGain->setValue(
config->getValueString(ConfigKey("[VinylControl]","gain")).toInt());
> @@ -182,6 +184,7 @@
>     m_COMode.slotSet(iMode);
>     config->set(ConfigKey("[VinylControl]","mode"), ConfigValue(iMode));
>     config->set(ConfigKey("[VinylControl]","needle_skip_prevention" ),
ConfigValue( (int)(NeedleSkipEnable->isChecked( )) ) );
> +    config->set(ConfigKey("[VinylControl]","show_signal_quality" ),
ConfigValue( (int)(SignalQualityEnable->isChecked( )) ) );
>
>     m_pVCManager->reloadConfig();
>     slotUpdate();
>
> === modified file 'mixxx/src/dlgprefvinyldlg.ui'
> --- mixxx/src/dlgprefvinyldlg.ui        2011-05-26 10:22:03 +0000
> +++ mixxx/src/dlgprefvinyldlg.ui        2011-07-30 20:21:03 +0000
> @@ -308,6 +308,13 @@
>         </property>
>        </spacer>
>       </item>
> +      <item row="3" column="0" colspan="3">
> +       <widget class="QCheckBox" name="SignalQualityEnable">
> +        <property name="text">
> +         <string>Show Signal Quality in Skin</string>
> +        </property>
> +       </widget>
> +      </item>
>      </layout>
>     </widget>
>    </item>
>
> === modified file 'mixxx/src/engine/enginebuffer.cpp'
> --- mixxx/src/engine/enginebuffer.cpp   2011-05-01 19:10:21 +0000
> +++ mixxx/src/engine/enginebuffer.cpp   2011-07-30 20:21:03 +0000
> @@ -336,6 +336,9 @@
>     m_pTrackSampleRate->set(iTrackSampleRate);
>     slotControlSeek(0.);
>
> +    //fix the duration
> +    pTrack->setDuration(iTrackNumSamples / (2 * iTrackSampleRate));
> +
>
>     // Let the engine know that a track is loaded now.
>     m_pTrackEndCOT->slotSet(0.0f); //XXX: Not sure if to use the COT or CO
here
>
> === modified file 'mixxx/src/engine/enginebufferscalelinear.cpp'
> --- mixxx/src/engine/enginebufferscalelinear.cpp        2011-04-16
20:51:48 +0000
> +++ mixxx/src/engine/enginebufferscalelinear.cpp        2011-07-30
20:21:03 +0000
> @@ -326,16 +326,6 @@
>         //at extremely low speeds, dampen the gain to hide pops and clicks
>         //this does cause odd-looking linear waveforms that go to zero and
back
>
> -        //although enginevinylsoundemu does this, it works much better
here
> -        //because the gain ramps as the rate does
> -        if (fabs(rate_add) < 0.5) {
> -           float dither = (float)(rand() % 32768) / 32768 - 0.5; //
dither
> -           //float dither = 0;
> -           float gainfrac = fabs(rate_add) / 0.5;
> -           buf[i] = gainfrac * (float)buf[i] + dither;
> -           buf[i+1] = gainfrac * (float)buf[i+1] + dither;
> -        }
> -
>         /*writer << QString("%1,%2,%3,%4\n").arg(buffer_count)
>                                          .arg(buffer[i])
>                                            .arg(prev_sample[0])
>
> === modified file 'mixxx/src/engine/enginedeck.cpp'
> --- mixxx/src/engine/enginedeck.cpp     2011-04-15 22:19:45 +0000
> +++ mixxx/src/engine/enginedeck.cpp     2011-07-30 20:21:03 +0000
> @@ -54,8 +54,7 @@
>     // Process the raw audio
>     m_pBuffer->process(0, pOut, iBufferSize);
>     // Emulate vinyl sounds
> -    // This causes popping, disable -Owen
> -    //m_pVinylSoundEmu->process(pOut, pOut, iBufferSize);
> +    m_pVinylSoundEmu->process(pOut, pOut, iBufferSize);
>     // Apply pregain
>     m_pPregain->process(pOut, pOut, iBufferSize);
>     // Filter the channel with EQs
>
> === modified file 'mixxx/src/engine/enginevinylsoundemu.cpp'
> --- mixxx/src/engine/enginevinylsoundemu.cpp    2010-09-17 04:15:33 +0000
> +++ mixxx/src/engine/enginevinylsoundemu.cpp    2011-07-30 20:21:03 +0000
> @@ -23,7 +23,7 @@
>
>  /** This class emulates the response of a vinyl record's audio to changes
>  *   in speed. In practice, it quiets the audio during very slow playback.
> - *   This also helps mask the aliasing due to interpolation that occurs
at
> + *   Dithering also helps mask the aliasing due to interpolation that
occurs at
>  *   these slow speeds.
>  */
>
> @@ -31,7 +31,7 @@
>  {
>     m_pConfig = pConfig;
>     m_pRateEngine = ControlObject::getControl(ConfigKey(group,
"rateEngine"));
> -    m_fAbsSpeed = 0.0f;
> +    m_fSpeed = m_fOldSpeed = 0.0f;
>     m_fGainFactor = 1.0f;
>  }
>
> @@ -43,30 +43,34 @@
>  void EngineVinylSoundEmu::process(const CSAMPLE * pIn, const CSAMPLE *
pOut, const int iBufferSize)
>  {
>     CSAMPLE * pOutput = (CSAMPLE *)pOut;
> -    m_fAbsSpeed = fabs((float)m_pRateEngine->get());
> -    //qDebug() << m_pRateEngine->get();
> +    m_fSpeed = (float)m_pRateEngine->get();
> +    float rateFrac = 2 * (m_fSpeed - m_fOldSpeed) / (float)iBufferSize;
> +    float curRate = m_fOldSpeed;
>
>     const float thresholdSpeed = 0.070f; //Scale volume if playback speed
is below 7%.
> -    if (m_fAbsSpeed < thresholdSpeed && m_fAbsSpeed > 0.0f) //Change the
volume based on the playback speed.
> -    {
> -        //The numbers in this formula are important:
> -        //  - The "1 + ..." makes the minimum value of the parameter of
log10
> -        //    be 1, which makes the gain 0.
> -        //  - The "* 9" makes the maximum value of the log10 become 10 (9
+ 1 = 10)
> -        //    which gives a gain of 1
> -        //m_fGainFactor = log10(1 + m_fAbsSpeed/0.50f * 9);
> -        m_fGainFactor = m_fAbsSpeed/thresholdSpeed;
> -        //qDebug() << m_fGainFactor << m_fAbsSpeed;
> -    }
> -    else if (m_fAbsSpeed == 0.0f)
> -        m_fGainFactor = 0.0f; //Log blows up at 0 :)
> -    else
> -    {
> -        m_fGainFactor = 1.0f;
> -    }
> -
> -    // Apply whatever gain we calculated. SampleUtil takes care of
aliased
> -    // buffers and gains of 1 or 0.
> -    SampleUtil::copyWithGain(pOutput, pIn, m_fGainFactor, iBufferSize);
> +    const float ditherSpeed = 0.85f; //Dither if playback speed is below
85%.
> +
> +    //iterate over old rate to new rate to prevent audible pops
> +    for (int i=0; i<iBufferSize; i+=2)
> +    {
> +        float dither = 0;
> +        if (fabs(curRate) < ditherSpeed) {
> +            dither = (float)(rand() % 32768) / 32768 - 0.5;
> +        }
> +
> +        if (fabs(curRate) < thresholdSpeed) {
> +            float gainfrac = fabs(curRate) / thresholdSpeed;
> +            pOutput[i] = gainfrac * (float)pIn[i] + dither;
> +            pOutput[i+1] = gainfrac * (float)pIn[i+1] + dither;
> +        }
> +        else
> +        {
> +           pOutput[i] = pIn[i] + dither;
> +           pOutput[i+1] = pIn[i+1] + dither;
> +        }
> +
> +        curRate += rateFrac;
> +    }
> +    m_fOldSpeed = m_fSpeed;
>  }
>
>
> === modified file 'mixxx/src/engine/enginevinylsoundemu.h'
> --- mixxx/src/engine/enginevinylsoundemu.h      2009-01-24 04:39:32 +0000
> +++ mixxx/src/engine/enginevinylsoundemu.h      2011-07-30 20:21:03 +0000
> @@ -28,7 +28,7 @@
>  private:
>     ConfigObject<ConfigValue> *m_pConfig;
>     ControlObject *m_pRateEngine;
> -    float m_fAbsSpeed;
> +    float m_fSpeed, m_fOldSpeed;
>     float m_fGainFactor;
>  };
>
>
> === modified file 'mixxx/src/engine/vinylcontrolcontrol.cpp'
> --- mixxx/src/engine/vinylcontrolcontrol.cpp    2011-05-11 04:38:17 +0000
> +++ mixxx/src/engine/vinylcontrolcontrol.cpp    2011-07-30 20:21:03 +0000
> @@ -27,12 +27,18 @@
>     m_pControlVinylEnabled = new ControlPushButton(ConfigKey(pGroup,
"vinylcontrol_enabled"));
>     m_pControlVinylEnabled->set(0);
>     m_pControlVinylEnabled->setToggleButton(true);
> +    m_pControlVinylWantEnabled = new ControlPushButton(ConfigKey(pGroup,
"vinylcontrol_wantenabled"));
> +    m_pControlVinylWantEnabled->set(0);
> +    m_pControlVinylWantEnabled->setToggleButton(true);
>     m_pControlVinylMode = new ControlPushButton(ConfigKey(pGroup,
"vinylcontrol_mode"));
>     m_pControlVinylMode->setStates(3);
>     m_pControlVinylMode->setToggleButton(true);
>     m_pControlVinylCueing = new ControlPushButton(ConfigKey(pGroup,
"vinylcontrol_cueing"));
>     m_pControlVinylCueing->setStates(3);
>     m_pControlVinylCueing->setToggleButton(true);
> +    m_pControlVinylSignalEnabled = new
ControlPushButton(ConfigKey(pGroup, "vinylcontrol_signal_enabled"));
> +    m_pControlVinylSignalEnabled->set(1);
> +    m_pControlVinylSignalEnabled->setToggleButton(true);
>  }
>
>  VinylControlControl::~VinylControlControl() {
>
> === modified file 'mixxx/src/engine/vinylcontrolcontrol.h'
> --- mixxx/src/engine/vinylcontrolcontrol.h      2011-05-11 04:38:17 +0000
> +++ mixxx/src/engine/vinylcontrolcontrol.h      2011-07-30 20:21:03 +0000
> @@ -25,7 +25,9 @@
>     ControlObject* m_pControlVinylStatus;
>     ControlPushButton* m_pControlVinylMode;
>     ControlPushButton* m_pControlVinylEnabled;
> +    ControlPushButton* m_pControlVinylWantEnabled;
>     ControlPushButton* m_pControlVinylCueing;
> +    ControlPushButton* m_pControlVinylSignalEnabled;
>     TrackPointer m_pCurrentTrack;
>  };
>
>
> === modified file 'mixxx/src/mixxx.cpp'
> --- mixxx/src/mixxx.cpp 2011-05-06 09:45:12 +0000
> +++ mixxx/src/mixxx.cpp 2011-07-30 20:21:03 +0000
> @@ -481,7 +481,8 @@
>     if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(m_pView,
>                                         m_pKeyboard,
>                                         m_pPlayerManager,
> -                                        m_pLibrary))) {
> +                                        m_pLibrary,
> +                                        m_pVCManager))) {
>         qDebug() << "Could not load default skin.";
>     }
>
> @@ -875,9 +876,6 @@
>     // Either check or uncheck the vinyl control menu item depending on
what
>     // it was saved as.
>     m_pOptionsVinylControl->setCheckable(true);
> -    //make sure control is off on startup (this is redundant to
vinylcontrolmanager.cpp)
> -    m_pConfig->set(
> -            ConfigKey("[VinylControl]", "enabled_ch1"), false);
>     m_pOptionsVinylControl->setChecked(false);
>     m_pOptionsVinylControl->setStatusTip(tr("Activate Vinyl Control"));
>     m_pOptionsVinylControl->setWhatsThis(
> @@ -891,8 +889,6 @@
>         SLOT(slotControlVinylControl(double)));
>
>     m_pOptionsVinylControl2->setCheckable(true);
> -    m_pConfig->set(
> -            ConfigKey("[VinylControl]", "enabled_ch2"), false);
>     m_pOptionsVinylControl2->setChecked(false);
>     m_pOptionsVinylControl2->setStatusTip(tr("Activate Vinyl Control"));
>     m_pOptionsVinylControl2->setWhatsThis(
> @@ -1162,15 +1158,9 @@
>  {
>  #ifdef __VINYLCONTROL__
>     if (m_pVCManager->vinylInputEnabled(1)) {
> -        m_pConfig->set(
> -            ConfigKey("[VinylControl]", "enabled_ch1"),
ConfigValue((int)toggle));
>         m_pOptionsVinylControl->setChecked((bool)toggle);
> -        if (toggle) {
> -            ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_status"))->set(VINYL_STATUS_OK);
> -        } else {
> -            ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_status"))->set(VINYL_STATUS_DISABLED);
> -        }
>     } else {
> +        m_pOptionsVinylControl->setChecked(false);
>         if (toggle) {
>             QMessageBox::warning(this, tr("Mixxx"),
>                 tr("No input device(s) select.\nPlease select your
soundcard(s) "
> @@ -1179,8 +1169,6 @@
>                 QMessageBox::Ok);
>             m_pPrefDlg->show();
>             m_pPrefDlg->showSoundHardwarePage();
> -            m_pOptionsVinylControl->setChecked(false);
> -            m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch1"),
ConfigValue(0));
>             ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_status"))->set(VINYL_STATUS_DISABLED);
>             ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_enabled"))->set(0);
>         }
> @@ -1191,27 +1179,17 @@
>  void MixxxApp::slotCheckboxVinylControl(bool toggle)
>  {
>  #ifdef __VINYLCONTROL__
> -    bool current =
(bool)m_pConfig->getValueString(ConfigKey("[VinylControl]","enabled_ch1")).toInt();
> -    if (current != toggle) {
> -        ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_enabled"))->set((double)toggle);
> -    }
> +    ControlObject::getControl(ConfigKey("[Channel1]",
"vinylcontrol_enabled"))->set((double)toggle);
>  #endif
>  }
>
>  void MixxxApp::slotControlVinylControl2(double toggle)
>  {
>  #ifdef __VINYLCONTROL__
> -    //we just need at least 1 input (deck 1) because of single deck mode
>     if (m_pVCManager->vinylInputEnabled(2)) {
> -        m_pConfig->set(
> -            ConfigKey("[VinylControl]", "enabled_ch2"),
ConfigValue((int)toggle));
> -           m_pOptionsVinylControl2->setChecked((bool)toggle);
> -       if (toggle) {
> -           ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_status"))->set(VINYL_STATUS_OK);
> -       } else {
> -           ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_status"))->set(VINYL_STATUS_DISABLED);
> -       }
> +        m_pOptionsVinylControl2->setChecked((bool)toggle);
>     } else {
> +        m_pOptionsVinylControl2->setChecked(false);
>         if (toggle) {
>             QMessageBox::warning(this, tr("Mixxx"),
>                 tr("No input device(s) select.\nPlease select your
soundcard(s) "
> @@ -1220,8 +1198,6 @@
>                 QMessageBox::Ok);
>             m_pPrefDlg->show();
>             m_pPrefDlg->showSoundHardwarePage();
> -            m_pOptionsVinylControl2->setChecked(false);
> -            m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch2"),
ConfigValue(0));
>             ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_status"))->set(VINYL_STATUS_DISABLED);
>             ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_enabled"))->set(0);
>         }
> @@ -1232,10 +1208,7 @@
>  void MixxxApp::slotCheckboxVinylControl2(bool toggle)
>  {
>  #ifdef __VINYLCONTROL__
> -    bool current =
(bool)m_pConfig->getValueString(ConfigKey("[VinylControl]","enabled_ch2")).toInt();
> -    if (current != toggle) {
> -        ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_enabled"))->set((double)toggle);
> -    }
> +    ControlObject::getControl(ConfigKey("[Channel2]",
"vinylcontrol_enabled"))->set((double)toggle);
>  #endif
>  }
>
> @@ -1428,7 +1401,8 @@
>     if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(m_pView,
>                                         m_pKeyboard,
>                                         m_pPlayerManager,
> -                                        m_pLibrary))) {
> +                                        m_pLibrary,
> +                                        m_pVCManager))) {
>         qDebug() << "Could not reload the skin.";
>     }
>
>
> === modified file 'mixxx/src/skin/legacyskinparser.cpp'
> --- mixxx/src/skin/legacyskinparser.cpp 2011-05-05 21:29:33 +0000
> +++ mixxx/src/skin/legacyskinparser.cpp 2011-07-30 20:21:03 +0000
> @@ -58,11 +58,13 @@
>  LegacySkinParser::LegacySkinParser(ConfigObject<ConfigValue>* pConfig,
>                                    MixxxKeyboard* pKeyboard,
>                                    PlayerManager* pPlayerManager,
> -                                   Library* pLibrary)
> +                                   Library* pLibrary,
> +                                   VinylControlManager* pVCMan)
>         : m_pConfig(pConfig),
>           m_pKeyboard(pKeyboard),
>           m_pPlayerManager(pPlayerManager),
>           m_pLibrary(pLibrary),
> +          m_pVCManager(pVCMan),
>           m_pParent(NULL) {
>
>  }
> @@ -611,7 +613,7 @@
>  QWidget* LegacySkinParser::parseSpinny(QDomElement node) {
>     QString channelStr = lookupNodeGroup(node);
>     const char* pSafeChannelStr = safeChannelString(channelStr);
> -    WSpinny* p = new WSpinny(m_pParent);
> +    WSpinny* p = new WSpinny(m_pParent, m_pVCManager);
>     setupWidget(node, p);
>
>     connect(p, SIGNAL(trackDropped(QString, QString)),
>
> === modified file 'mixxx/src/skin/legacyskinparser.h'
> --- mixxx/src/skin/legacyskinparser.h   2011-04-29 03:18:02 +0000
> +++ mixxx/src/skin/legacyskinparser.h   2011-07-30 20:21:03 +0000
> @@ -9,6 +9,7 @@
>
>  #include "configobject.h"
>  #include "skin/skinparser.h"
> +#include "vinylcontrol/vinylcontrolmanager.h"
>
>  class Library;
>  class MixxxKeyboard;
> @@ -20,7 +21,7 @@
>   public:
>     LegacySkinParser(ConfigObject<ConfigValue>* pConfig,
>                      MixxxKeyboard* pKeyboard, PlayerManager*
pPlayerManager,
> -                     Library* pLibrary);
> +                     Library* pLibrary, VinylControlManager* pVCMan);
>     virtual ~LegacySkinParser();
>
>     virtual bool canParse(QString skinPath);
> @@ -73,6 +74,7 @@
>     MixxxKeyboard* m_pKeyboard;
>     PlayerManager* m_pPlayerManager;
>     Library* m_pLibrary;
> +    VinylControlManager* m_pVCManager;
>     QWidget *m_pParent;
>     static QList<const char*> s_channelStrs;
>     static QMutex s_safeStringMutex;
>
> === modified file 'mixxx/src/skin/skinloader.cpp'
> --- mixxx/src/skin/skinloader.cpp       2011-01-07 22:31:50 +0000
> +++ mixxx/src/skin/skinloader.cpp       2011-07-30 20:21:03 +0000
> @@ -5,6 +5,7 @@
>  #include <QDir>
>  #include <QtDebug>
>
> +#include "vinylcontrol/vinylcontrolmanager.h"
>  #include "skin/skinloader.h"
>  #include "skin/legacyskinparser.h"
>
> @@ -52,10 +53,11 @@
>  QWidget* SkinLoader::loadDefaultSkin(QWidget* pParent,
>                                        MixxxKeyboard* pKeyboard,
>                                        PlayerManager* pPlayerManager,
> -                                       Library* pLibrary) {
> +                                       Library* pLibrary,
> +                                       VinylControlManager* pVCMan) {
>     QString skinPath = getConfiguredSkinPath();
>
> -    LegacySkinParser legacy(m_pConfig, pKeyboard, pPlayerManager,
pLibrary);
> +    LegacySkinParser legacy(m_pConfig, pKeyboard, pPlayerManager,
pLibrary, pVCMan);
>     qDebug() << "Legacy can parse:" << legacy.canParse(skinPath);
>     return legacy.parseSkin(skinPath, pParent);
>  }
>
> === modified file 'mixxx/src/skin/skinloader.h'
> --- mixxx/src/skin/skinloader.h 2011-01-06 19:05:52 +0000
> +++ mixxx/src/skin/skinloader.h 2011-07-30 20:21:03 +0000
> @@ -17,7 +17,8 @@
>     QWidget* loadDefaultSkin(QWidget* pParent,
>                                MixxxKeyboard* pKeyboard,
>                                PlayerManager* pPlayerManager,
> -                               Library* pLibrary);
> +                               Library* pLibrary,
> +                               VinylControlManager* pVCMan);
>
>     QString getConfiguredSkinPath();
>
>
> === modified file 'mixxx/src/soundmanager.cpp'
> --- mixxx/src/soundmanager.cpp  2011-07-19 18:12:33 +0000
> +++ mixxx/src/soundmanager.cpp  2011-07-30 20:21:03 +0000
> @@ -26,6 +26,7 @@
>  #include "sounddevice.h"
>  #include "sounddeviceportaudio.h"
>  #include "engine/enginemaster.h"
> +#include "engine/enginebuffer.h"
>  #include "controlobjectthreadmain.h"
>  #include "soundmanagerutil.h"
>  #include "controlobject.h"
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrol.cpp'
> --- mixxx/src/vinylcontrol/vinylcontrol.cpp     2011-04-29 16:57:44 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrol.cpp     2011-07-30 20:21:03 +0000
> @@ -11,6 +11,8 @@
>
>     // Get Control objects
>     playPos             = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"playposition")));    //Range: -.14 to 1.14
> +    trackSamples        = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"track_samples")));
> +    trackSampleRate     = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"track_samplerate")));
>     vinylSeek           = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_seek")));
>     controlScratch      = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"scratch2")));
>     rateSlider          = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group, "rate")));
 //Range -1.0 to 1.0
> @@ -19,11 +21,13 @@
>     duration            = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"duration")));
>     mode                = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_mode")));
>     enabled             = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_enabled")));
> +    wantenabled         = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_wantenabled")));
>     cueing              = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_cueing")));
>     rateRange           = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"rateRange")));
>     vinylStatus     = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_status")));
>     rateDir         = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"rate_dir")));
>     loopEnabled     = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"loop_enabled")));
> +    signalenabled     = new
ControlObjectThread(ControlObject::getControl(ConfigKey(group,
"vinylcontrol_signal_enabled")));
>
>     dVinylPitch = 0.0f;
>     dVinylPosition = 0.0f;
> @@ -47,8 +51,8 @@
>     //Vinyl control mode
>     iVCMode =
m_pConfig->getValueString(ConfigKey("[VinylControl]","mode")).toInt();
>
> -    //Enabled or not
> -    bIsEnabled =
m_pConfig->getValueString(ConfigKey(group,"vinylcontrol_enabled")).toInt();
> +    //Enabled or not -- load from saved value in case vinyl control is
restarting
> +    bIsEnabled = wantenabled->get();
>
>     //Gain
>     ControlObject::getControl(ConfigKey("[VinylControl]", "gain"))->set(
> @@ -59,7 +63,9 @@
>  {
>     bIsEnabled = enable;
>     if (m_pConfig)
> +    {
>         m_pConfig->set(ConfigKey(m_group,"vinylcontrol_enabled"),
ConfigValue((int)enable));
> +    }
>
>     enabled->slotSet(enable);
>
> @@ -71,8 +77,15 @@
>
>  VinylControl::~VinylControl()
>  {
> +    bool wasEnabled = bIsEnabled;
>     enabled->slotSet(false);
>     vinylStatus->slotSet(VINYL_STATUS_DISABLED);
> +    if (wasEnabled)
> +    {
> +        //if vinyl control is just restarting, indicate that it should
> +        //be enabled
> +        wantenabled->slotSet(true);
> +    }
>  }
>
>  float VinylControl::getSpeed()
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrol.h'
> --- mixxx/src/vinylcontrol/vinylcontrol.h       2011-05-11 04:38:17 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrol.h       2011-07-30 20:21:03 +0000
> @@ -35,7 +35,7 @@
>
>  #define MIXXX_VC_DEFAULT_LEADINTIME 0
>
> -#define MIXXX_VINYL_SCOPE_SIZE 128
> +#define MIXXX_VINYL_SCOPE_SIZE 100
>
>  //TODO: Make this an EngineObject instead one day? (need to route all the
input audio through the engine that way too...)
>
> @@ -62,6 +62,8 @@
>     QString m_group;
>     ControlObjectThread *playButton; //The ControlObject used to
start/stop playback of the song.
>     ControlObjectThread *playPos; //The ControlObject used to read the
playback position in the song.
> +    ControlObjectThread *trackSamples;
> +    ControlObjectThread *trackSampleRate;
>     ControlObjectThread *vinylSeek; //The ControlObject used to change the
playback position in the song.
>     ControlObjectThread *controlScratch; //The ControlObject used to seek
when the record is spinning fast.
>     ControlObjectThread *rateSlider; //The ControlObject used to change
the speed/pitch of the song.
> @@ -69,11 +71,13 @@
>     ControlObjectThread *duration; //The ControlObject used to get the
duration of the current song.
>     ControlObjectThread *mode; //The ControlObject used to get the vinyl
control mode (absolute/relative/scratch)
>     ControlObjectThread *enabled; //The ControlObject used to get if the
vinyl control is enabled or disabled.
> +    ControlObjectThread *wantenabled; //The ControlObject used to get if
the vinyl control should try to enable itself
>     ControlObjectThread *cueing; //Should cueing mode be active?
>     ControlObjectThread *rateRange; //The ControlObject used to the get
the pitch range from the prefs.
>     ControlObjectThread *vinylStatus;
>     ControlObjectThread *rateDir; //direction of rate
>     ControlObjectThread *loopEnabled; //looping enabled?
> +    ControlObjectThread *signalenabled; //show the signal in the skin?
>     //ControlObject *vinylStatus;  //Status of vinyl control
>
>     int iLeadInTime; //The lead-in time...
> @@ -86,6 +90,7 @@
>     float fRateRange; //The pitch range setting from Mixxx's preferences
>     float m_fTimecodeQuality; //Used as a measure of the quality of the
timecode signal.
>
> +    float fTrackDuration;
>     unsigned long iSampleRate;
>     bool bIsEnabled;
>     int iRIAACorrection;
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrolmanager.cpp'
> --- mixxx/src/vinylcontrol/vinylcontrolmanager.cpp      2011-07-19
20:54:56 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrolmanager.cpp      2011-07-30
20:21:03 +0000
> @@ -26,11 +26,9 @@
>  {
>     // load a bunch of stuff
>
ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_enabled"))
> -        ->queueFromThread(m_pConfig->getValueString(
> -                ConfigKey("[VinylControl]","enabled_ch1")).toDouble());
> +        ->queueFromThread(0);
>
ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_enabled"))
> -        ->queueFromThread(m_pConfig->getValueString(
> -                ConfigKey("[VinylControl]","enabled_ch2")).toDouble());
> +        ->queueFromThread(0);
>     ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_mode"))
>         ->queueFromThread(m_pConfig->getValueString(
>                 ConfigKey("[VinylControl]","mode")).toDouble());
> @@ -62,8 +60,6 @@
>
>     // save a bunch of stuff to config
>     // turn off vinyl control so it won't be enabled on load (this is
redundant to mixxx.cpp)
> -    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch1"), false);
> -    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch2"), false);
>     m_pConfig->set(ConfigKey("[Channel 1]","vinylcontrol_enabled"),
false);
>     m_pConfig->set(ConfigKey("[Channel 2]","vinylcontrol_enabled"),
false);
>     m_pConfig->set(ConfigKey("[VinylControl]","mode"),
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp'
> --- mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp 2011-04-17
04:16:00 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp 2011-07-30
20:21:03 +0000
> @@ -31,7 +31,7 @@
>     : QWidget(),
>       m_iTimerId(0),
>       m_pVinylControl(NULL),
> -      m_iSize(128),
> +      m_iSize(100),
>       m_qImage(),
>       m_bVinylActive(FALSE) {
>  }
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrolxwax.cpp'
> --- mixxx/src/vinylcontrol/vinylcontrolxwax.cpp 2011-05-21 01:07:25 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrolxwax.cpp 2011-07-30 20:21:03 +0000
> @@ -47,6 +47,7 @@
>     iOldMode        = MIXXX_VCMODE_ABSOLUTE;
>     dUiUpdateTime   = -1.0f;
>     m_bNeedleSkipPrevention = (bool)(m_pConfig->getValueString( ConfigKey(
"[VinylControl]", "needle_skip_prevention" ) ).toInt());
> +    signalenabled->slotSet(m_pConfig->getValueString( ConfigKey(
"[VinylControl]", "show_signal_quality" ) ).toInt());
>
>     dLastTrackSelectPos = 0.0;
>     dCurTrackSelectPos = 0.0;
> @@ -97,6 +98,7 @@
>     //Note that timecoder_init will not double-malloc the LUTs, and after
this we are guaranteed
>     //that the LUT has been generated unless we ran out of memory.
>     m_bLUTInitialized = true;
> +    m_uiSafeZone = timecoder_get_safe(&timecoder);
>     //}
>     s_xwaxLUTMutex.unlock();
>
> @@ -177,6 +179,7 @@
>     double dPitchRing[RING_SIZE];
>     int ringPos = 0;
>     int ringFilled = 0;
> +    double cur_duration = -1.0f;
>     double old_duration = -1.0f;
>     int reportedMode = 0;
>     bool reportedPlayButton = 0;
> @@ -225,36 +228,62 @@
>         //if no track loaded, let track selection work but that's it
>         if (duration == NULL)
>         {
> -            bTrackSelectMode = true;
> -            doTrackSelection(false, dVinylPitch, iPosition);
> +            //until I can figure out how to detect "track 2" on serato
CD,
> +            //don't try track selection
> +            if (!m_bCDControl)
> +            {
> +                bTrackSelectMode = true;
> +                doTrackSelection(false, dVinylPitch, iPosition);
> +            }
>             continue;
>         }
>         //qDebug() << m_group << id << iPosition << dVinylPitch;
>
> -        double cur_duration = duration->get();
> +        cur_duration = duration->get();
> +
> +
> +        //Has a new track been loaded?
>         //FIXME? we should really sync on all track changes
>         if (cur_duration != old_duration)
>         {
>             bForceResync=true;
>             bTrackSelectMode = false; //just in case
>             old_duration = cur_duration;
> +            //duration from the control object is an integer.  We need
> +            //more precision:
> +            fTrackDuration = trackSamples->get() / 2 /
trackSampleRate->get();
> +
> +            //we were at record end, so turn it off and restore mode
> +            if(atRecordEnd)
> +            {
> +                disableRecordEndMode();
> +                if (iOldMode == MIXXX_VCMODE_CONSTANT)
> +                    iVCMode = MIXXX_VCMODE_RELATIVE;
> +                else
> +                    iVCMode = iOldMode;
> +            }
>         }
>
> -        dVinylPosition = iPosition;
> -        dVinylPosition = dVinylPosition / 1000.0f;
> -        dVinylPosition -= iLeadInTime;
> +        //make sure dVinylPosition only has good values
> +        if (iPosition != -1)
> +        {
> +            dVinylPosition = iPosition;
> +            dVinylPosition = dVinylPosition / 1000.0f;
> +            dVinylPosition -= iLeadInTime;
> +        }
> +
> +
>
>         //Initialize drift control to zero in case we don't get any
position data to calculate it with.
>         dDriftControl = 0.0f;
>
> -        filePosition = playPos->get() * cur_duration;             //Get
the playback position in the file in seconds.
> +        filePosition = playPos->get() * fTrackDuration;             //Get
the playback position in the file in seconds.
>
>         reportedMode = mode->get();
>         reportedPlayButton = playButton->get();
>
>         if (iVCMode != reportedMode)
>         {
> -            //qDebug() << "cur mode" << iVCMode << "new mode" <<
reportedMode;
>             //if we are playing, don't allow change
>             //to absolute mode (would cause sudden track skip)
>             if (reportedPlayButton && reportedMode ==
MIXXX_VCMODE_ABSOLUTE)
> @@ -282,7 +311,6 @@
>             iVCMode = MIXXX_VCMODE_RELATIVE;
>             mode->slotSet((double)iVCMode);
>         }
> -
>         //are we newly playing near the end of the record?  (in absolute
mode, this happens
>         //when the filepos is past safe (more accurate),
>         //but it can also happen in relative mode if the vinylpos is
nearing the end
> @@ -292,13 +320,13 @@
>         {
>             if (iVCMode == MIXXX_VCMODE_ABSOLUTE)
>             {
> -                if ((filePosition + iLeadInTime) * 1000.0f  >
timecoder_get_safe(&timecoder) &&
> +                if ((filePosition + iLeadInTime) * 1000.0f  >
m_uiSafeZone &&
>                     !bForceResync) //corner case: we are waiting for
resync so don't enable just yet
>                     enableRecordEndMode();
>             }
>             else if (iVCMode == MIXXX_VCMODE_RELATIVE || iVCMode ==
MIXXX_VCMODE_CONSTANT)
>             {
> -                if (iPosition != -1 && iPosition >
timecoder_get_safe(&timecoder))
> +                if (iPosition != -1 && iPosition > m_uiSafeZone)
>                     enableRecordEndMode();
>             }
>         }
> @@ -307,25 +335,20 @@
>         {
>             //if atRecordEnd was true, maybe it no longer applies:
>
> -            if ((iVCMode == MIXXX_VCMODE_ABSOLUTE &&
> -                    (filePosition + iLeadInTime) * 1000.0f  <=
timecoder_get_safe(&timecoder)))
> -            {
> -                //if we are in absolute mode and the file position is in
a safe zone now
> -                disableRecordEndMode();
> -            }
> -            else if (!reportedPlayButton)
> +            if (!reportedPlayButton)
>             {
>                 //if we turned off play button, also disable
>                 disableRecordEndMode();
>             }
> -            else if (iPosition != -1)
> +            else if (iPosition != -1 &&
> +                     iPosition <= m_uiSafeZone &&
> +                     dVinylPosition > 0 &&
> +                     checkSteadyPitch(dVinylPitch, filePosition) > 0.5)
> +
>             {
> -                //if relative mode, and vinylpos is safe
> -                if (iVCMode == MIXXX_VCMODE_RELATIVE &&
> -                    iPosition <= timecoder_get_safe(&timecoder))
> -                {
> -                    disableRecordEndMode();
> -                }
> +                //if good position, and safe, and not in leadin, and
steady,
> +                //disable
> +                disableRecordEndMode();
>             }
>
>             if (atRecordEnd)
> @@ -345,17 +368,22 @@
>
>         if (!atRecordEnd)
>         {
> -            if (iPosition != -1 && iPosition >
timecoder_get_safe(&timecoder))
> +            if (iPosition != -1 && iPosition > m_uiSafeZone)
>             {
> -                if (!bTrackSelectMode)
> +                //until I can figure out how to detect "track 2" on
serato CD,
> +                //don't try track selection
> +                if (!m_bCDControl)
>                 {
> -                    qDebug() << "position greater than safe, select mode"
<< iPosition << timecoder_get_safe(&timecoder);
> -                    bTrackSelectMode = true;
> -                    togglePlayButton(FALSE);
> -                       resetSteadyPitch(0.0f, 0.0f);
> -                    controlScratch->slotSet(0.0f);
> +                    if (!bTrackSelectMode)
> +                    {
> +                        qDebug() << "position greater than safe, select
mode" << iPosition << m_uiSafeZone;
> +                        bTrackSelectMode = true;
> +                        togglePlayButton(FALSE);
> +                           resetSteadyPitch(0.0f, 0.0f);
> +                        controlScratch->slotSet(0.0f);
> +                    }
> +                    doTrackSelection(true, dVinylPitch, iPosition);
>                 }
> -                doTrackSelection(true, dVinylPitch, iPosition);
>
>                 //hm I wonder if track will keep playing while this
happens?
>                 //not sure what we want to do here...  probably enforce
> @@ -432,8 +460,9 @@
>
>                 //save the absolute amount of drift for when we need to
estimate vinyl position
>                 dDriftAmt = dVinylPosition - filePosition;
> +
> +                //qDebug() << "drift" << dDriftAmt;
>
> -                //qDebug() << "vinyl" << dVinylPosition << "file" <<
filePosition;
>                 if (bForceResync)
>                 {
>                     //if forceresync was set but we're no longer absolute,
> @@ -504,12 +533,14 @@
>
>                 //Calculate how much the vinyl's position has drifted from
it's timecode and compensate for it.
>                 //(This is caused by the manufacturing process of the
vinyl.)
> -                dDriftControl = ((filePosition - dVinylPosition)  /
dVinylPosition) / 100 * 4.0f;
> +                if (fabs(dDriftAmt) > 0.1 && fabs(dDriftAmt) < 5.0) {
> +                    dDriftControl = dDriftAmt;
> +                } else {
> +                    dDriftControl = 0.0;
> +                }
>
>                 //if we hit the end of the ring, loop around
> -                ringPos++;
> -                if(ringPos >= RING_SIZE)
> -                        ringPos = 0;
> +                ringPos = (ringPos + 1) % RING_SIZE;
>                 dOldPos = dVinylPosition;
>             }
>             else
> @@ -528,6 +559,14 @@
>                     ringFilled = 0;
>                     continue;
>                 }
> +
> +                if (iVCMode == MIXXX_VCMODE_ABSOLUTE &&
> +                    fabs(dVinylPitch) < 0.05 &&
> +                    fabs(dDriftAmt) >= 0.3f)
> +                {
> +                    qDebug() << "slow, out of sync, syncing position";
> +                    syncPosition();
> +                }
>
>                 dOldPos = filePosition + dDriftAmt;
>
> @@ -556,13 +595,12 @@
>             else
>                 averagePitch = dVinylPitch;
>
> -
>             if (iVCMode == MIXXX_VCMODE_ABSOLUTE)
>             {
> -                controlScratch->slotSet(averagePitch + dDriftControl);
> +                controlScratch->slotSet(dVinylPitch + dDriftControl);
>                 if (iPosition != -1 && reportedPlayButton &&
uiUpdateTime(filePosition))
>                 {
> -                    rateSlider->slotSet(rateDir->get() *
(fabs(averagePitch + dDriftControl) - 1.0f) / fRateRange);
> +                    rateSlider->slotSet(rateDir->get() *
(fabs(dVinylPitch + dDriftControl) - 1.0f) / fRateRange);
>                     dUiUpdateTime = filePosition;
>                 }
>             }
> @@ -587,14 +625,21 @@
>             //let the track play a wee bit more before deciding we've
stopped
>
>             rateSlider->slotSet(0.0f);
> +
> +            if (iVCMode == MIXXX_VCMODE_ABSOLUTE &&
> +                fabs(dVinylPosition - filePosition) >= 0.1f)
> +            {
> +                qDebug() << "stopped, out of sync, syncing position";
> +                syncPosition();
> +            }
>
>             if(fabs(filePosition - dOldFilePos) >= 0.1 ||
>                 !m_bNeedleSkipPrevention ||
>                 filePosition == dOldFilePos)
>             {
>                 //We are not playing any more
> -                   togglePlayButton(FALSE);
> -                   resetSteadyPitch(0.0f, 0.0f);
> +                togglePlayButton(FALSE);
> +                resetSteadyPitch(0.0f, 0.0f);
>                 controlScratch->slotSet(0.0f);
>                 //resetSteadyPitch(dVinylPitch, filePosition);
>                 //Notify the UI that the timecode quality is
garbage/missing.
> @@ -643,15 +688,8 @@
>  {
>     vinylStatus->slotSet(VINYL_STATUS_OK);
>     atRecordEnd = false;
> -    //don't start a new track with constant mode
> -    if (iVCMode == MIXXX_VCMODE_CONSTANT)
> -    {
> -        if (iOldMode == MIXXX_VCMODE_CONSTANT)
> -            iVCMode = MIXXX_VCMODE_RELATIVE;
> -        else
> -            iVCMode = iOldMode;
> -        mode->slotSet((double)iVCMode);
> -    }
> +    iVCMode = MIXXX_VCMODE_RELATIVE;
> +    mode->slotSet((double)iVCMode);
>  }
>
>  void VinylControlXwax::togglePlayButton(bool on)
> @@ -769,11 +807,19 @@
>  void VinylControlXwax::syncPosition()
>  {
>     //qDebug() << "sync position" << dVinylPosition / duration->get();
> -       vinylSeek->slotSet(dVinylPosition / duration->get());
 //VinylPos in seconds / total length of song
> +    vinylSeek->slotSet(dVinylPosition / fTrackDuration);    //VinylPos in
seconds / total length of song
>  }
>
>  bool VinylControlXwax::checkEnabled(bool was, bool is)
>  {
> +       // if we're not enabled, but the last object was, try turning
ourselves on
> +    // XXX: is this just a race that's working right now?
> +    if (!is and wantenabled->get())
> +    {
> +        enabled->slotSet(true);
> +        wantenabled->slotSet(false); //don't try to do this over and over
> +        return true; //optimism!
> +    }
>     if (was != is)
>     {
>         //we reset the scratch value, but we don't reset the rate slider.
> @@ -824,7 +870,9 @@
>  {
>     bQualityRing[iQualPos] = quality_sample;
>     if(iQualFilled < QUALITY_RING_SIZE)
> -    iQualFilled++;
> +    {
> +        iQualFilled++;
> +    }
>
>     int quality = 0;
>     for (int i=0; i<iQualFilled; i++)
> @@ -836,9 +884,7 @@
>     //qDebug() << "quality" << m_fTimecodeQuality;
>     m_fTimecodeQuality = (float)quality / (float)iQualFilled;
>
> -    iQualPos++;
> -    if(iQualPos >= QUALITY_RING_SIZE)
> -        iQualPos = 0;
> +    iQualPos = (iQualPos + 1) % QUALITY_RING_SIZE;
>  }
>
>  float VinylControlXwax::getAngle()
>
> === modified file 'mixxx/src/vinylcontrol/vinylcontrolxwax.h'
> --- mixxx/src/vinylcontrol/vinylcontrolxwax.h   2011-04-17 04:16:00 +0000
> +++ mixxx/src/vinylcontrol/vinylcontrolxwax.h   2011-07-30 20:21:03 +0000
> @@ -48,6 +48,7 @@
>     void establishQuality(bool quality_sample);
>
>     double dFileLength; // The length (in samples) of the current song.
> +    unsigned int m_uiSafeZone; // Cache the position of the end of record
>
>     double dOldPos; // The position read last time it was polled.
>     double dOldPitch;
>
> === modified file 'mixxx/src/waveform/waveformrenderer.cpp'
> --- mixxx/src/waveform/waveformrenderer.cpp     2011-04-06 21:20:35 +0000
> +++ mixxx/src/waveform/waveformrenderer.cpp     2011-07-30 20:21:03 +0000
> @@ -26,6 +26,8 @@
>  #define DEFAULT_SUBPIXELS_PER_PIXEL 4
>  #define DEFAULT_PIXELS_PER_SECOND 100
>
> +#define RATE_INCREMENT 0.015
> +
>  void WaveformRenderer::run() {
>     double msecs_old = 0, msecs_elapsed = 0;
>
> @@ -61,6 +63,7 @@
>     m_dRate(0),
>     m_dRateRange(0),
>     m_dRateDir(0),
> +    m_iRateAdjusting(0),
>     m_iDupes(0),
>     m_dPlayPosAdjust(0),
>     m_iLatency(0),
> @@ -190,7 +193,7 @@
>  }
>
>  void WaveformRenderer::slotUpdateRate(double v) {
> -    m_dRate = v;
> +    m_dTargetRate = v;
>  }
>
>  void WaveformRenderer::slotUpdateRateRange(double v) {
> @@ -501,6 +504,26 @@
>
>     //qDebug() << m_dPlayPosAdjust;
>
> +    // Gradually stretch the waveform
> +    if (fabs(m_dTargetRate - m_dRate) > RATE_INCREMENT)
> +    {
> +        if ((m_dTargetRate - m_dRate) > 0)
> +        {
> +            m_iRateAdjusting = m_iRateAdjusting > 0 ? m_iRateAdjusting +
1 : 1;
> +            m_dRate = math_min(m_dTargetRate, m_dRate + RATE_INCREMENT *
pow(m_iRateAdjusting, 2) / 80);
> +        }
> +        else
> +        {
> +            m_iRateAdjusting = m_iRateAdjusting < 0 ? m_iRateAdjusting -
1 : -1;
> +            m_dRate = math_max(m_dTargetRate, m_dRate - RATE_INCREMENT *
pow(m_iRateAdjusting, 2) / 80);
> +        }
> +    }
> +    else
> +    {
> +        m_iRateAdjusting = 0;
> +        m_dRate = m_dTargetRate;
> +    }
> +
>     // Limit our rate adjustment to < 99%, "Bad Things" might happen
otherwise.
>     double rateAdjust = m_dRateDir * math_min(0.99, m_dRate *
m_dRateRange);
>
>
> === modified file 'mixxx/src/waveform/waveformrenderer.h'
> --- mixxx/src/waveform/waveformrenderer.h       2011-03-08 22:17:41 +0000
> +++ mixxx/src/waveform/waveformrenderer.h       2011-07-30 20:21:03 +0000
> @@ -61,7 +61,8 @@
>
>     int m_iPlayPosTime, m_iPlayPosTimeOld;
>     QTime m_playPosTime, m_playPosTimeOld;
> -    double m_dPlayPos, m_dPlayPosOld, m_dRate, m_dRateRange, m_dRateDir;
> +    double m_dPlayPos, m_dPlayPosOld, m_dTargetRate, m_dRate,
m_dRateRange, m_dRateDir;
> +    int m_iRateAdjusting;
>     int m_iDupes;
>     double m_dPlayPosAdjust;
>     int m_iLatency;
>
> === modified file 'mixxx/src/widget/wspinny.cpp'
> --- mixxx/src/widget/wspinny.cpp        2011-05-12 14:46:18 +0000
> +++ mixxx/src/widget/wspinny.cpp        2011-07-30 20:21:03 +0000
> @@ -6,7 +6,7 @@
>  #include "sharedglcontext.h"
>  #include "wspinny.h"
>
> -WSpinny::WSpinny(QWidget* parent) :
QGLWidget(SharedGLContext::getContext(), parent),
> +WSpinny::WSpinny(QWidget* parent, VinylControlManager* pVCMan) :
QGLWidget(SharedGLContext::getContext(), parent),
>     m_pBG(NULL),
>     m_pFG(NULL),
>     m_pGhost(NULL),
> @@ -20,6 +20,12 @@
>     m_pScratchToggle(NULL),
>     m_pScratchPos(NULL),
>     m_pVinylControlSpeedType(NULL),
> +    m_pVinylControlEnabled(NULL),
> +    m_bVinylActive(false),
> +    m_bSignalActive(true),
> +    m_iSize(0),
> +    m_iTimerId(0),
> +    m_iSignalUpdateTick(0),
>     m_fAngle(0.0f),
>     m_fGhostAngle(0.0f),
>     m_dPausedPosition(0.0f),
> @@ -29,6 +35,10 @@
>     m_iFullRotations(0),
>     m_dPrevTheta(0.)
>  {
> +#ifdef __VINYLCONTROL__
> +    m_pVCManager = pVCMan;
> +    m_pVinylControl = NULL;
> +#endif
>     //Drag and drop
>     setAcceptDrops(true);
>  }
> @@ -69,6 +79,13 @@
>     if (m_pBG && !m_pBG->isNull()) {
>         setFixedSize(m_pBG->size());
>     }
> +
> +#ifdef __VINYLCONTROL__
> +    m_iSize = MIXXX_VINYL_SCOPE_SIZE;
> +    m_qImage = QImage(m_iSize, m_iSize, QImage::Format_ARGB32);
> +    //fill with transparent black
> +    m_qImage.fill(qRgba(0,0,0,0));
> +#endif
>
>     m_pPlay = new ControlObjectThreadMain(ControlObject::getControl(
>                         ConfigKey(group, "play")));
> @@ -92,6 +109,15 @@
>                         ConfigKey(group, "scratch_position_enable")));
>     m_pScratchPos = new ControlObjectThreadMain(ControlObject::getControl(
>                         ConfigKey(group, "scratch_position")));
> +
> +    Q_ASSERT(m_pPlayPos);
> +    Q_ASSERT(m_pDuration);
> +
> +    //Repaint when visual_playposition changes.
> +    connect(m_pVisualPlayPos, SIGNAL(valueChanged(double)),
> +            this, SLOT(updateAngle(double)));
> +
> +#ifdef __VINYLCONTROL__
>     m_pVinylControlSpeedType = new
ControlObjectThreadMain(ControlObject::getControl(
>                         ConfigKey(group, "vinylcontrol_speed_type")));
>     if (m_pVinylControlSpeedType)
> @@ -99,17 +125,26 @@
>         //Initialize the rotational speed.
>         this->updateVinylControlSpeed(m_pVinylControlSpeedType->get());
>     }
> -    Q_ASSERT(m_pPlayPos);
> -    Q_ASSERT(m_pDuration);
> -
> -    //Repaint when visual_playposition changes.
> -    connect(m_pVisualPlayPos, SIGNAL(valueChanged(double)),
> -            this, SLOT(updateAngle(double)));
> +    m_pVinylControlEnabled = new
ControlObjectThreadMain(ControlObject::getControl(
> +                        ConfigKey(group, "vinylcontrol_enabled")));
> +    m_pSignalEnabled = new
ControlObjectThreadMain(ControlObject::getControl(
> +                        ConfigKey(group,
"vinylcontrol_signal_enabled")));
> +    m_pRate = new ControlObjectThreadMain(ControlObject::getControl(
> +                        ConfigKey(group, "rate")));
>
>     //Match the vinyl control's set RPM so that the spinny widget rotates
at the same
>     //speed as your physical decks, if you're using vinyl control.
>     connect(m_pVinylControlSpeedType, SIGNAL(valueChanged(double)),
>             this, SLOT(updateVinylControlSpeed(double)));
> +
> +    //Make sure vinyl control proxies are up to date
> +    connect(m_pVinylControlEnabled, SIGNAL(valueChanged(double)),
> +            this, SLOT(updateVinylControlEnabled(double)));
> +
> +    //Check the rate to see if we are stopped
> +    connect(m_pRate, SIGNAL(valueChanged(double)),
> +            this, SLOT(updateRate(double)));
> +#endif
>  }
>
>  void WSpinny::paintEvent(QPaintEvent *e)
> @@ -121,6 +156,49 @@
>     if (m_pBG) {
>         p.drawPixmap(0, 0, *m_pBG);
>     }
> +
> +#ifdef __VINYLCONTROL__
> +    // Overlay the signal quality drawing if vinyl is active
> +    if (m_bVinylActive && m_bSignalActive)
> +    {
> +        //reduce cpu load by only updating every 3 times
> +        m_iSignalUpdateTick = (m_iSignalUpdateTick + 1) % 3;
> +        if (m_iSignalUpdateTick == 0)
> +        {
> +            unsigned char * buf = m_pVinylControl->getScopeBytemap();
> +            int r,g,b;
> +            QColor qual_color = QColor();
> +            float signalQuality = m_pVinylControl->getTimecodeQuality();
> +
> +            //color is related to signal quality
> +            //hsv:  s=1, v=1
> +            //h is the only variable.
> +            //h=0 is red, h=120 is green
> +            qual_color.setHsv((int)(120.0 * signalQuality), 255, 255);
> +            qual_color.getRgb(&r, &g, &b);
> +
> +            if (buf) {
> +                for (int y=0; y<m_iSize; y++) {
> +                    QRgb *line = (QRgb *)m_qImage.scanLine(y);
> +                    for(int x=0; x<m_iSize; x++) {
> +                        //use xwax's bitmap to set alpha data only
> +                        //adjust alpha by 3/4 so it's not quite so
distracting
> +                        //setpixel is slow, use scanlines instead
> +                        //m_qImage.setPixel(x, y,
qRgba(r,g,b,(int)buf[x+m_iSize*y] * .75));
> +                        *line = qRgba(r,g,b,(int)(buf[x+m_iSize*y] *
.75));
> +                        line++;
> +                    }
> +                }
> +                p.drawImage(this->rect(), m_qImage);
> +            }
> +        }
> +        else
> +        {
> +            //draw the last good image
> +            p.drawImage(this->rect(), m_qImage);
> +        }
> +    }
> +#endif
>
>     //To rotate the foreground pixmap around the center of the image,
>     //we use the classic trick of translating the coordinate system such
that
> @@ -147,7 +225,7 @@
>         //Rotate back to the playback position (not the ghost positon),
>         //and draw the beat marks from there.
>         p.restore();
> -
> +
>         /*
>         //Draw a line where the next 4 beats are
>         double bpm = m_pBPM->get();
> @@ -247,6 +325,29 @@
>  void WSpinny::updateAngle(double playpos)
>  {
>     m_fAngle = calculateAngle(playpos);
> +
> +    // if we had the timer going, kill it
> +    if (m_iTimerId != 0) {
> +        killTimer(m_iTimerId);
> +        m_iTimerId = 0;
> +    }
> +    update();
> +}
> +
> +void WSpinny::updateRate(double rate)
> +{
> +    //if rate is zero, updateAngle won't get called,
> +    if (rate == 0.0 && m_bVinylActive)
> +    {
> +        if (m_iTimerId == 0)
> +        {
> +            m_iTimerId = startTimer(10);
> +        }
> +    }
> +}
> +
> +void WSpinny::timerEvent(QTimerEvent *event)
> +{
>     update();
>  }
>
> @@ -266,6 +367,60 @@
>     m_dRotationsPerSecond = rpm/60.;
>  }
>
> +void WSpinny::updateVinylControlEnabled(double enabled)
> +{
> +#ifdef __VINYLCONTROL__
> +    if (enabled)
> +    {
> +        if (m_pVinylControl == NULL)
> +        {
> +            QList<VinylControlProxy*> VCProxiesList =
m_pVCManager->vinylControlProxies();
> +            if (m_group == "[Channel1]")
> +            {
> +                m_pVinylControl = VCProxiesList.value(0);
> +            }
> +            else if (m_group == "[Channel2]")
> +            {
> +                m_pVinylControl = VCProxiesList.value(1);
> +            }
> +
> +            if (m_pVinylControl != NULL)
> +            {
> +                m_bVinylActive = true;
> +                m_bSignalActive = m_pSignalEnabled->get();
> +                connect(m_pVinylControl, SIGNAL(destroyed()),
> +                    this, SLOT(invalidateVinylControl()));
> +            }
> +        }
> +        else
> +        {
> +            m_bVinylActive = true;
> +        }
> +    }
> +    else
> +    {
> +        m_bVinylActive = false;
> +        //don't need the timer anymore
> +        if (m_iTimerId != 0)
> +        {
> +            killTimer(m_iTimerId);
> +        }
> +        // draw once more to erase signal
> +        update();
> +    }
> +#endif
> +}
> +
> +void WSpinny::invalidateVinylControl()
> +{
> +#ifdef __VINYLCONTROL__
> +    m_bVinylActive = false;
> +    m_pVinylControl = NULL;
> +    update();
> +#endif
> +}
> +
> +
>  void WSpinny::mouseMoveEvent(QMouseEvent * e)
>  {
>     int y = e->y();
> @@ -301,7 +456,7 @@
>     //qDebug() << "c t:" << theta << "pt:" << m_dPrevTheta <<
>     //            "icr" << m_iFullRotations;
>
> -    if (e->buttons() & Qt::LeftButton)
> +    if (e->buttons() & Qt::LeftButton && !m_bVinylActive)
>     {
>         //Convert deltaTheta into a percentage of song length.
>         double absPos = calculatePositionFromAngle(theta);
> @@ -325,6 +480,10 @@
>
>     m_iStartMouseX = x;
>     m_iStartMouseY = y;
> +
> +    //don't do anything if vinyl control is active
> +    if (m_bVinylActive)
> +        return;
>
>     if (e->button() == Qt::LeftButton)
>     {
> @@ -394,7 +553,7 @@
>     Q_UNUSED(e); //ditch unused param warning
>
>     /*
> -    double wheelDirection = ((QWheelEvent *)e)->delta() / 120.;
> +    double wheelDirection = ((QWheelEvent *)e)->delta() / 120.;
>     double newValue = getValue() + (wheelDirection);
>     this->updateValue(newValue);
>
>
> === modified file 'mixxx/src/widget/wspinny.h'
> --- mixxx/src/widget/wspinny.h  2011-05-11 04:38:17 +0000
> +++ mixxx/src/widget/wspinny.h  2011-07-30 20:21:03 +0000
> @@ -4,6 +4,11 @@
>
>  #include <QGLWidget>
>  #include "wwidget.h"
> +#include "vinylcontrol/vinylcontrolmanager.h"
> +#ifdef __VINYLCONTROL__
> +#include "vinylcontrol/vinylcontrolproxy.h"
> +#include "vinylcontrol/vinylcontrol.h"
> +#endif
>
>  class ControlObjectThreadMain;
>
> @@ -11,15 +16,18 @@
>  {
>     Q_OBJECT
>     public:
> -        WSpinny(QWidget* parent);
> +        WSpinny(QWidget* parent, VinylControlManager* pVCMan);
>         ~WSpinny();
>         void setup(QDomNode node, QString group);
>         void dragEnterEvent(QDragEnterEvent *event);
>         void dropEvent(QDropEvent *event);
>     public slots:
>         void updateAngle(double);
> +        void updateRate(double);
>         void updateAngleForGhost();
>         void updateVinylControlSpeed(double rpm);
> +        void updateVinylControlEnabled(double enabled);
> +        void invalidateVinylControl();
>     signals:
>         void trackDropped(QString filename, QString group);
>     protected:
> @@ -29,6 +37,7 @@
>         void mousePressEvent(QMouseEvent * e);
>         void mouseReleaseEvent(QMouseEvent * e);
>         void wheelEvent(QWheelEvent *e);
> +        void timerEvent(QTimerEvent* event);
>
>         double calculateAngle(double playpos);
>         int calculateFullRotations(double playpos);
> @@ -47,7 +56,22 @@
>         ControlObjectThreadMain* m_pScratch;
>         ControlObjectThreadMain* m_pScratchToggle;
>         ControlObjectThreadMain* m_pScratchPos;
> +        ControlObjectThreadMain* m_pRate;
>         ControlObjectThreadMain* m_pVinylControlSpeedType;
> +        ControlObjectThreadMain* m_pVinylControlEnabled;
> +        ControlObjectThreadMain* m_pSignalEnabled;
> +
> +#ifdef __VINYLCONTROL__
> +        VinylControlManager* m_pVCManager;
> +        VinylControlProxy* m_pVinylControl;
> +#endif
> +        bool m_bVinylActive;
> +        bool m_bSignalActive;
> +        QImage m_qImage;
> +        int m_iSize;
> +        int m_iTimerId;
> +        int m_iSignalUpdateTick;
> +
>         QString m_group;
>         float m_fAngle; //Degrees
>         float m_fGhostAngle;
>
>