Merge lp:~mixxxdevelopers/mixxx/features_cuefile into lp:~mixxxdevelopers/mixxx/trunk

[Phillip Whelan]

This adds support for generating CUE files when recording. This file can be used to split the recording or to generate playlists.

[RJ Skerry-Ryan (rryan)]

Hey Phil,

Really sorry for taking so long to get to this! This all looks nice, I just have some general issues with lack of n-deck support and the duplication between EngineShoutcast and EngineRecord:

- The metadata recording is hard coded to work with only 2 decks. I'd really rather not add more 2-deck code if we don't have to. Can you use the [Master],num_decks control (alternatively, thread the PlayerManager into EngineRecord)? Every deck has an "orientation" control which indicates the side of the crossfader it is attached to. You can use this in conjunction with its volume/pregain faders to figure out if they are "hearable". PlayerInfo is N-Deck ready, so that shouldn't be a problem.

- Assuming you'll change this given the above comment anyway, but ControlObject::getControl shouldn't be used in code that gets called on a schedule. As written it'll be doing 5 locks of the global ControlObject static mutex per call (plus 5 hash lookups) to getActiveTracks() when it could be written just a little more verbosely to get 0 per call.

- There's now a fair amount of duplicated code between EngineShoutcast and EngineRecord. Can you pull the current-metadata-detection code out into a common class that they both use? You could even build it into the PlayerInfo singleton class since that already exists.

- Minor nit: EngineRecord::m_pMetaDataLife is an int so its prefix should be m_iMetaDataFile

- Maybe pull 5000 out into a constant? UPDATE_RATE_MS or something. also add a comment about what it is

thanks,
RJ

review: Needs Fixing

[lp:~mixxxdevelopers/mixxx/features_cuefile]

2626. By Phillip Whelan on 2011-03-23

Merging from Trunk.

[RAFFI TEA (raffitea)]

Hey Philip,

there's a singleton PlayerInfo class that EngineShoutcast uses to get track information per deck. Maybe you can extract metadata recording in there. This would be of great benefit for the library history feature, too.

[Phillip Whelan (pwhelan)]

Right now I am moving the 'Current Track' functionality into PlayerInfo.

I was planning on using a timestamp to make sure it updates at most once per X seconds. If another call is made within that timeframe it returns the last answer it made.

[lp:~mixxxdevelopers/mixxx/features_cuefile]

2627. By Phillip Whelan on 2011-03-23

Move all the Current Deck code into PlayerInfo. Make it N-deck aware.

  * Add the getCurrentPlayingDeck method to PlayerInfo:
      Returns the deck number of the loudest active deck.
  * Add the getCurrentPlayingTrack method to PlayerInfo.
  * Refactor EngineRecord to query PlayerInfo for the current track.
  * Refactor EngineShoutCast to query Playerinfo for the current track.
  * Change instances of m_pMetadataLife to m_iMetadataLife.

2628. By Phillip Whelan on 2011-03-23

Make getCurrentPlayingDeck method thread safe with a Mutex. getCurrentPlayingTrack does not need a Mutex since it calls mutex'd methods and uses no other state itself.

[Phillip Whelan (pwhelan)]

I moved all the functionality into PlayefInfo and refactored EngineRecord and EngineShoutCast to use it.

[RJ Skerry-Ryan (rryan)]

Awesome -- looks good for merging. I found these two issues:

1) TrackInfoObject::getId() only works for Mixxx library tracks. It won't work for tracks loaded from Rhythmbox, iTunes, Traktor, or Browse tracks, since all their IDs are -1. This might change in the future, but the best way is to probably just compare the TrackPointers directly. You're guaranteed that for tracks in the Mixxx library, there is only one TrackInfoObject* that exists for it, so QSharedPointer::operator= will work to tell if it's the same track. RB, iTunes, Traktor and Browse don't work this way, but at least they could be made to work that way when/if they ever keep track of the TIO's that they create. I would change all uses of getId() to compare the TrackPointers directly.

2) I tried out the cuefile recording and it didn't pick up 2 out of the 4 tracks I played. I think the problem is the math in PlayerInfo::getCurrentPlayingDeck. All the volume values are integers, while the engine volume values are 0.0 to 1.0 and the crossfader is -1.0 to 1.0, so these will get rounded off in integer conversion. Also, I think the xfvol calculation is slightly off since the orientation controls have non-intuitive values: left is 0, center is 1, right is 2.

This value for the xfval calculation worked for me (all 6 tracks I played got recorded in the correct order):

xfvol = 1 - 0.5 * fabs(m_listCOOrientation[chan]->get() - 1.0 - m_COxfader->get());

It maps tracks opposite from each other (e.g. oriented right crossfader left and vice-versa) to 0.0, and tracks that are exactly aligned w/ the crossfader (left/left, center/center, or right/right) to 1.0.

review: Approve

[lp:~mixxxdevelopers/mixxx/features_cuefile]

2629. By Phillip Whelan on 2011-03-25

FIX: get xfader code to work orientation values; left = 0, right = 2.

2630. By Phillip Whelan on 2011-03-25

FIX: take into account that TrackInfoObject->getId() == -1 for external track sources.

=== modified file 'mixxx/src/dlgprefrecord.cpp'
--- mixxx/src/dlgprefrecord.cpp	2010-11-01 17:24:48 +0000
+++ mixxx/src/dlgprefrecord.cpp	2011-03-25 05:39:41 +0000
@@ -55,11 +55,14 @@
 
     //Connections
     connect(PushButtonBrowse, SIGNAL(clicked()),        this,   SLOT(slotBrowseSave()));
+    connect(PushButtonBrowseCue, SIGNAL(clicked()),        this,   SLOT(slotBrowseCueSave()));
     connect(LineEditRecPath,  SIGNAL(returnPressed()),  this,   SLOT(slotApply()));
     connect(comboBoxEncoding, SIGNAL(activated(int)),   this,   SLOT(slotRecordPathChange()));
     connect(SliderQuality,    SIGNAL(valueChanged(int)), this,  SLOT(slotSliderQuality()));
     connect(SliderQuality,    SIGNAL(sliderMoved(int)), this,   SLOT(slotSliderQuality()));
     connect(SliderQuality,    SIGNAL(sliderReleased()), this,   SLOT(slotSliderQuality()));
+    connect(CheckBoxRecordCueFile, SIGNAL(stateChanged(int)), this, SLOT(slotEnableCueFile(int)));
+    connect(LineEditRecPath, SIGNAL(textChanged(QString)), this, SLOT(slotRecordPathChanged(QString)));
 
     slotApply();
     recordControl->slotSet(RECORD_OFF); //make sure a corrupt config file won't cause us to record constantly
@@ -80,6 +83,45 @@
     }
 }
 
+void DlgPrefRecord::slotBrowseCueSave()
+{
+    QString encodingFileFilter = QString("CUE file (*.cue)");
+    QString selectedFile = QFileDialog::getSaveFileName(NULL, tr("Save Cue File As..."), config->getValueString(ConfigKey(RECORDING_PREF_KEY,"CuePath")), encodingFileFilter);
+    if (selectedFile.toLower() != "")
+    {
+        if(!selectedFile.toLower().endsWith(".cue"))
+        {
+            selectedFile.append(".cue");
+        }        
+        LineEditCuePath->setText( selectedFile );
+    }
+}
+
+void DlgPrefRecord::slotEnableCueFile(int enabled)
+{
+    bool status = enabled ? true : false;
+
+
+    config->set(ConfigKey(RECORDING_PREF_KEY, "CueEnabled"), ConfigValue(CheckBoxRecordCueFile->isChecked()));
+
+    LabelCueFile->setEnabled(status);
+    LineEditCuePath->setEnabled(status);
+    PushButtonBrowseCue->setEnabled(status);
+}
+
+void DlgPrefRecord::slotRecordPathChanged(QString path)
+{
+    QString cuePath = path;
+    int pos;
+
+
+    pos = path.lastIndexOf(".");
+    cuePath.replace(pos, 4, ".cue");
+    cuePath.truncate(pos + 4);
+
+    LineEditCuePath->setText(cuePath);
+}
+
 void DlgPrefRecord::slotSliderQuality()
 {
     updateTextQuality();
@@ -192,6 +234,7 @@
 void DlgPrefRecord::slotApply()
 {
     config->set(ConfigKey(RECORDING_PREF_KEY, "Path"), LineEditRecPath->text());
+    config->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), LineEditCuePath->text());
     setMetaData();
 
     slotEncoding();
 
=== modified file 'mixxx/src/dlgprefrecord.h'
--- mixxx/src/dlgprefrecord.h	2008-03-20 03:42:11 +0000
+++ mixxx/src/dlgprefrecord.h	2011-03-25 05:39:41 +0000
@@ -41,6 +41,9 @@
     void slotApply();
 	void slotUpdate();
     void slotBrowseSave();
+    void slotBrowseCueSave();
+    void slotEnableCueFile(int);
+    void slotRecordPathChanged(QString);
     void slotEncoding();
     void slotSliderQuality();
     void slotRecordPathChange();
 
=== modified file 'mixxx/src/dlgprefrecorddlg.ui'
--- mixxx/src/dlgprefrecorddlg.ui	2010-11-29 21:23:11 +0000
+++ mixxx/src/dlgprefrecorddlg.ui	2011-03-25 05:39:41 +0000
@@ -239,6 +239,63 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="CheckBoxRecordCueFile">
+     <property name="text">
+      <string>Create a CUE file</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="LabelCueFile">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Cue File</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="LineEditCuePath">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="PushButtonBrowseCue">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Browse...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
 
=== modified file 'mixxx/src/engine/engineshoutcast.cpp'
--- mixxx/src/engine/engineshoutcast.cpp	2010-11-04 18:32:26 +0000
+++ mixxx/src/engine/engineshoutcast.cpp	2011-03-25 05:39:41 +0000
@@ -27,9 +27,9 @@
 #include "playerinfo.h"
 #include "trackinfoobject.h"
 #ifdef __WINDOWS__
-	#include <windows.h>
-	//sleep on linux assumes seconds where as Sleep on Windows assumes milliseconds
-	#define sleep(x) Sleep(x*1000)
+    #include <windows.h>
+    //sleep on linux assumes seconds where as Sleep on Windows assumes milliseconds
+    #define sleep(x) Sleep(x*1000)
 #endif
 
 #define TIMEOUT 10
@@ -49,9 +49,6 @@
           m_pConfig(_config),
           m_encoder(NULL),
           m_pUpdateShoutcastFromPrefs(NULL),
-          m_pCrossfader(NULL),
-          m_pVolume1(NULL),
-          m_pVolume2(NULL),
           m_shoutMutex(QMutex::Recursive) {
 
     m_pShout = 0;
@@ -61,12 +58,6 @@
 
     m_bQuit = false;
 
-    m_pCrossfader = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Master]","crossfader")));
-    m_pVolume1 = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Channel1]","volume")));
-    m_pVolume2 = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Channel2]","volume")));
-
-
-
     m_firstCall = false;
     // Initialize libshout
     shout_init();
@@ -94,16 +85,13 @@
     QMutexLocker locker(&m_shoutMutex);
 
     if (m_encoder){
-		m_encoder->flush();
+        m_encoder->flush();
 
-		delete m_encoder;
-	}
+        delete m_encoder;
+    }
 
     delete m_pUpdateShoutcastFromPrefs;
     delete m_pShoutcastNeedUpdateFromPrefs;
-    delete m_pCrossfader;
-    delete m_pVolume1;
-    delete m_pVolume2;
 
     if (m_pShoutMetaData)
         shout_metadata_free(m_pShoutMetaData);
@@ -117,26 +105,26 @@
 {
     QMutexLocker locker(&m_shoutMutex);
     if (m_encoder){
-		m_encoder->flush();
-		delete m_encoder;
-		m_encoder = NULL;
-	}
+        m_encoder->flush();
+        delete m_encoder;
+        m_encoder = NULL;
+    }
 
     if (m_pShout) {
         shout_close(m_pShout);
-		return true;
+        return true;
     }
-	return false; //if no connection has been established, nothing can be disconnected
+    return false; //if no connection has been established, nothing can be disconnected
 }
 bool EngineShoutcast::isConnected()
 {
     QMutexLocker locker(&m_shoutMutex);
-	if (m_pShout) {
-		m_iShoutStatus = shout_get_connected(m_pShout);
-    	if (m_iShoutStatus == SHOUTERR_CONNECTED)
-    		return true;
-	}
-	return false;
+    if (m_pShout) {
+        m_iShoutStatus = shout_get_connected(m_pShout);
+        if (m_iShoutStatus == SHOUTERR_CONNECTED)
+            return true;
+    }
+    return false;
 }
 /*
  * Update EngineShoutcast values from the preferences.
@@ -162,11 +150,11 @@
     QByteArray baStreamPublic = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"stream_public")).toLatin1();
     QByteArray baBitrate    = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"bitrate")).toLatin1();
 
-	m_baFormat    = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"format")).toLatin1();
+    m_baFormat    = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"format")).toLatin1();
 
-	m_custom_metadata = (bool)m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"enable_metadata")).toInt();
-	m_baCustom_title = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"custom_title")).toLatin1();
-	m_baCustom_artist = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"custom_artist")).toLatin1();
+    m_custom_metadata = (bool)m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"enable_metadata")).toInt();
+    m_baCustom_title = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"custom_title")).toLatin1();
+    m_baCustom_artist = m_pConfig->getValueString(ConfigKey(SHOUTCAST_PREF_KEY,"custom_artist")).toLatin1();
 
     int format;
     int len;
@@ -174,22 +162,22 @@
 
 
     if (shout_set_host(m_pShout, baHost.data()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting hostname!", shout_get_error(m_pShout));
+        errorDialog("Error setting hostname!", shout_get_error(m_pShout));
         return;
     }
 
     if (shout_set_protocol(m_pShout, SHOUT_PROTOCOL_HTTP) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting protocol!", shout_get_error(m_pShout));
+        errorDialog("Error setting protocol!", shout_get_error(m_pShout));
         return;
     }
 
     if (shout_set_port(m_pShout, baPort.toUInt()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting port!", shout_get_error(m_pShout));
+        errorDialog("Error setting port!", shout_get_error(m_pShout));
         return;
     }
 
     if (shout_set_password(m_pShout, baPassword.data()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting password!", shout_get_error(m_pShout));
+        errorDialog("Error setting password!", shout_get_error(m_pShout));
         return;
     }
     if (shout_set_mount(m_pShout, baMountPoint.data()) != SHOUTERR_SUCCESS) {
@@ -198,22 +186,22 @@
     }
 
     if (shout_set_user(m_pShout, baLogin.data()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting username!", shout_get_error(m_pShout));
-        return;
-    }
-	if (shout_set_name(m_pShout, baStreamName.data()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting stream name!", shout_get_error(m_pShout));
-        return;
-    }
-	if (shout_set_description(m_pShout, baStreamDesc.data()) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting stream description!", shout_get_error(m_pShout));
-        return;
-    }
-	if (shout_set_genre(m_pShout, baStreamGenre.data()) != SHOUTERR_SUCCESS) {
-      	errorDialog("Error setting stream genre!", shout_get_error(m_pShout));
-        return;
-    }
-	if (shout_set_url(m_pShout, baStreamWebsite.data()) != SHOUTERR_SUCCESS) {
+        errorDialog("Error setting username!", shout_get_error(m_pShout));
+        return;
+    }
+    if (shout_set_name(m_pShout, baStreamName.data()) != SHOUTERR_SUCCESS) {
+        errorDialog("Error setting stream name!", shout_get_error(m_pShout));
+        return;
+    }
+    if (shout_set_description(m_pShout, baStreamDesc.data()) != SHOUTERR_SUCCESS) {
+        errorDialog("Error setting stream description!", shout_get_error(m_pShout));
+        return;
+    }
+    if (shout_set_genre(m_pShout, baStreamGenre.data()) != SHOUTERR_SUCCESS) {
+          errorDialog("Error setting stream genre!", shout_get_error(m_pShout));
+        return;
+    }
+    if (shout_set_url(m_pShout, baStreamWebsite.data()) != SHOUTERR_SUCCESS) {
        errorDialog("Error setting stream url!", shout_get_error(m_pShout));
        return;
     }
@@ -251,24 +239,24 @@
     } else if ( ! qstricmp(baServerType.data(), "Icecast 1")) {
         protocol = SHOUT_PROTOCOL_XAUDIOCAST;
     } else {
-		errorDialog("Error: unknown server protocol!", shout_get_error(m_pShout));
+        errorDialog("Error: unknown server protocol!", shout_get_error(m_pShout));
         return;
     }
 
     if (( protocol == SHOUT_PROTOCOL_ICY ) && ( format != SHOUT_FORMAT_MP3)) {
-		errorDialog("Error: libshout only supports Shoutcast with MP3 format!", shout_get_error(m_pShout));
-		return;
+        errorDialog("Error: libshout only supports Shoutcast with MP3 format!", shout_get_error(m_pShout));
+        return;
     }
 
     if (shout_set_protocol(m_pShout, protocol) != SHOUTERR_SUCCESS) {
-		errorDialog("Error setting protocol!", shout_get_error(m_pShout));
+        errorDialog("Error setting protocol!", shout_get_error(m_pShout));
         return;
     }
 
     // Initialize m_encoder
-	if(m_encoder) {
-		delete m_encoder;		//delete m_encoder if it has been initalized (with maybe) different bitrate
-	}
+    if(m_encoder) {
+        delete m_encoder;        //delete m_encoder if it has been initalized (with maybe) different bitrate
+    }
     if ( ! qstrcmp(m_baFormat, "MP3")) {
         m_encoder = new EncoderMp3(this);
 
@@ -281,11 +269,11 @@
         return;
     }
     if (m_encoder->initEncoder(baBitrate.toInt()) < 0) {
-		//e.g., if lame is not found
-		//init m_encoder itself will display a message box
-		qDebug() << "**** Encoder init failed";
-		delete m_encoder;
-		m_encoder = NULL;
+        //e.g., if lame is not found
+        //init m_encoder itself will display a message box
+        qDebug() << "**** Encoder init failed";
+        delete m_encoder;
+        m_encoder = NULL;
     }
 
 }
@@ -304,19 +292,19 @@
     m_iShoutFailures = 0;
     // set to a high number to automatically update the metadata
     // on the first change
-    m_pMetaDataLife = 31337;
-	//If static metadata is available, we only need to send metadata one time
-	m_firstCall = false;
+    m_iMetaDataLife = 31337;
+    //If static metadata is available, we only need to send metadata one time
+    m_firstCall = false;
 
-	/*Check if m_encoder is initalized
-	 * Encoder is initalized in updateFromPreferences which is called always before serverConnect()
-	 * If m_encoder is NULL, then we propably want to use MP3 streaming, however, lame could not be found
-	 * It does not make sense to connect
-	 */
-	 if(m_encoder == NULL){
-		m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
-		return false;
-	}
+    /*Check if m_encoder is initalized
+     * Encoder is initalized in updateFromPreferences which is called always before serverConnect()
+     * If m_encoder is NULL, then we propably want to use MP3 streaming, however, lame could not be found
+     * It does not make sense to connect
+     */
+     if(m_encoder == NULL){
+        m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
+        return false;
+    }
     const int iMaxTries = 3;
     while (!m_bQuit && m_iShoutFailures < iMaxTries) {
         if (m_pShout)
@@ -338,8 +326,8 @@
     if (m_iShoutFailures == iMaxTries) {
         if (m_pShout)
             shout_close(m_pShout);
-		m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
-		
+        m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
+        
     }
     if (m_bQuit) {
         if (m_pShout)
@@ -348,23 +336,23 @@
     }
 
     m_iShoutFailures = 0;
-	int timeout = 0;
+    int timeout = 0;
     while (m_iShoutStatus == SHOUTERR_BUSY && timeout < TIMEOUT) {
         qDebug() << "Connection pending. Sleeping...";
         sleep(1);
         m_iShoutStatus = shout_get_connected(m_pShout);
-		++ timeout;
+        ++ timeout;
     }
     if (m_iShoutStatus == SHOUTERR_CONNECTED) {
         qDebug() << "***********Connected to Shoutcast server...";
         return true;
     }
-	//otherwise disable shoutcast in preferences
-	m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
-	if(m_pShout){
-		shout_close(m_pShout);
-		//errorDialog(tr("Mixxx could not connect to the server"), tr("Please check your connection to the Internet and verify that your username and password are correct."));
-	}
+    //otherwise disable shoutcast in preferences
+    m_pConfig->set(ConfigKey("[Shoutcast]","enabled"),ConfigValue("0"));
+    if(m_pShout){
+        shout_close(m_pShout);
+        //errorDialog(tr("Mixxx could not connect to the server"), tr("Please check your connection to the Internet and verify that your username and password are correct."));
+    }
 
     return false;
 }
@@ -431,111 +419,60 @@
 void EngineShoutcast::process(const CSAMPLE *, const CSAMPLE *pOut, const int iBufferSize)
 {
     QMutexLocker locker(&m_shoutMutex);
-	 //Check to see if Shoutcast is enabled, and pass the samples off to be broadcast if necessary.
+     //Check to see if Shoutcast is enabled, and pass the samples off to be broadcast if necessary.
      bool prefEnabled = (m_pConfig->getValueString(ConfigKey("[Shoutcast]","enabled")).toInt() == 1);
 
     if (prefEnabled) {
-	    if(!isConnected()){
-			//Initialize the m_pShout structure with the info from Mixxx's m_shoutcast preferences.
-			updateFromPreferences();
+        if(!isConnected()){
+            //Initialize the m_pShout structure with the info from Mixxx's m_shoutcast preferences.
+            updateFromPreferences();
 
-			if(serverConnect()){
-				ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
-				props->setType(DLG_INFO);
-				props->setTitle(tr("Live broadcasting"));
-				props->setText(tr("Mixxx has successfully connected to the shoutcast server"));
-				ErrorDialogHandler::instance()->requestErrorDialog(props);
-			}
+            if(serverConnect()){
+                ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
+                props->setType(DLG_INFO);
+                props->setTitle(tr("Live broadcasting"));
+                props->setText(tr("Mixxx has successfully connected to the shoutcast server"));
+                ErrorDialogHandler::instance()->requestErrorDialog(props);
+            }
             else{
                 errorDialog(tr("Mixxx could not connect to streaming server"), tr("Please check your connection to the Internet and verify that your username and password are correct."));
 
             }
-		}
+        }
         //send to shoutcast, if connection has been established
         if (m_iShoutStatus != SHOUTERR_CONNECTED)
             return;
 
         if (iBufferSize > 0 && m_encoder){
             m_encoder->encodeBuffer(pOut, iBufferSize); //encode and send to shoutcast
-	    }
+        }
         //Check if track has changed and submit its new metadata to shoutcast
         if (metaDataHasChanged())
             updateMetaData();
 
         if (m_pUpdateShoutcastFromPrefs->get() > 0.0f){
-	        /*
-			 * You cannot change bitrate, hostname, etc while connected to a stream
-		     */
-			serverDisconnect();
-			updateFromPreferences();
-			serverConnect();
-		}
+            /*
+             * You cannot change bitrate, hostname, etc while connected to a stream
+             */
+            serverDisconnect();
+            updateFromPreferences();
+            serverConnect();
+        }
      }
     //if shoutcast is disabled
-	else{
-		if(isConnected()){
-			serverDisconnect();
-			ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
-			props->setType(DLG_INFO);
-			props->setTitle(tr("Live broadcasting"));
-			props->setText(tr("Mixxx has successfully disconnected to the shoutcast server"));
-
-			ErrorDialogHandler::instance()->requestErrorDialog(props);
-		}
-	}
-}
-
-/*
- * Algorithm which simply flips the lowest and/or second lowest bits,
- * bits 1 and 2, to represent which track is active and returns the result.
- */
-int EngineShoutcast::getActiveTracks()
-{
-    int tracks = 0;
-
-
-    if (ControlObject::getControl(ConfigKey("[Channel1]","play"))->get()==1.) tracks |= 1;
-    if (ControlObject::getControl(ConfigKey("[Channel2]","play"))->get()==1.) tracks |= 2;
-
-    if (tracks ==  0)
-        return 0;
-
-    // Detect the dominant track by checking the crossfader and volume levels
-    if ((tracks & 1) && (tracks & 2)) {
-
-        if ((m_pVolume1->get() == 0) && (m_pVolume2->get() == 0))
-            return 0;
-
-        if (m_pVolume2->get() == 0) {
-            tracks = 1;
-        }
-        else if ( m_pVolume1->get() == 0) {
-            tracks = 2;
-        }
-        // allow a bit of leeway with the crossfader
-        else if ((m_pCrossfader->get() < 0.05) && (m_pCrossfader->get() > -0.05)) {
-
-            if (m_pVolume1->get() > m_pVolume2->get()) {
-                tracks = 1;
-            }
-            else if (m_pVolume1->get() < m_pVolume2->get()) {
-                tracks = 2;
-            }
-
-        }
-        else if ( m_pCrossfader->get() < -0.05 ) {
-            tracks = 1;
-        }
-        else if ( m_pCrossfader->get() > 0.05 ) {
-            tracks = 2;
-        }
-
+    else{
+        if(isConnected()){
+            serverDisconnect();
+            ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
+            props->setType(DLG_INFO);
+            props->setTitle(tr("Live broadcasting"));
+            props->setText(tr("Mixxx has successfully disconnected to the shoutcast server"));
+
+            ErrorDialogHandler::instance()->requestErrorDialog(props);
+        }
     }
-
-    return tracks;
 }
 
-
 /*
  * Check if the metadata has changed since the previous check.
  * We also check when was the last check performed to avoid using
@@ -545,50 +482,35 @@
 bool EngineShoutcast::metaDataHasChanged()
 {
     QMutexLocker locker(&m_shoutMutex);
-    int tracks;
-    TrackPointer newMetaData;
-    bool changed = false;
-
-
-    if ( m_pMetaDataLife < 16 ) {
-        m_pMetaDataLife++;
-        return false;
-    }
-
-    m_pMetaDataLife = 0;
-
-
-    tracks = getActiveTracks();
-
-    switch (tracks)
-    {
-    case 0:
-        // no tracks are playing
-        // we should set the metadata to nothing
-        break;
-    case 1:
-        // track 1 is active
-        newMetaData = PlayerInfo::Instance().getTrackInfo("[Channel1]");
-        if (newMetaData != m_pMetaData)
-        {
-            m_pMetaData = newMetaData;
-            changed = true;
-        }
-        break;
-    case 2:
-        // track 2 is active
-		newMetaData = PlayerInfo::Instance().getTrackInfo("[Channel2]");
-		if (newMetaData != m_pMetaData)
-        {
-            m_pMetaData = newMetaData;
-            changed = true;
-        }
-        break;
-    case 3:
-        // both tracks are active, just stick with it for now
-        break;
-    }
-    return changed;
+    TrackPointer pTrack;
+
+
+    if ( m_iMetaDataLife < 16 ) {
+        m_iMetaDataLife++;
+        return false;
+    }
+
+    m_iMetaDataLife = 0;
+
+
+    pTrack = PlayerInfo::Instance().getCurrentPlayingTrack();
+    if ( !pTrack )
+        return false;
+
+    if ( m_pMetaData ) {
+        if ((pTrack->getId() == -1) || (m_pMetaData->getId() == -1)) {
+            if ((pTrack->getArtist() == m_pMetaData->getArtist()) &&
+                (pTrack->getTitle() == m_pMetaData->getArtist())) {
+                return false;
+            }
+        }
+        else if (pTrack->getId() == m_pMetaData->getId()) {
+            return false;
+        }
+    }
+
+    m_pMetaData = pTrack;
+    return true;
 }
 
 /*
@@ -603,51 +525,48 @@
         return;
 
     QByteArray baSong = "";
-	/**
+    /**
      * If track has changed and static metadata is disabled
-	 * Send new metadata to shoutcast!
+     * Send new metadata to shoutcast!
      * This works only for MP3 streams properly as stated in comments, see shout.h
-	 * WARNING: Changing OGG metadata dynamically by using shout_set_metadata
-	 * will cause stream interruptions to listeners
-	 *
-	 * Also note: Do not try to include Vorbis comments in OGG packages and send them to stream.
-	 * This was done in EncoderVorbis previously and caused interruptions on track change as well
-	 * which sounds awful to listeners.
-
-	 * To conlcude: Only write OGG metadata one time, i.e., if static metadata is used.
- 	 */
+     * WARNING: Changing OGG metadata dynamically by using shout_set_metadata
+     * will cause stream interruptions to listeners
+     *
+     * Also note: Do not try to include Vorbis comments in OGG packages and send them to stream.
+     * This was done in EncoderVorbis previously and caused interruptions on track change as well
+     * which sounds awful to listeners.
+     * To conlcude: Only write OGG metadata one time, i.e., if static metadata is used.
+      */
 
 
     //If we use MP3 streaming and want dynamic metadata changes
-	if(!m_custom_metadata && !qstrcmp(m_baFormat, "MP3")){
-		if (m_pMetaData != NULL) {
-		    // convert QStrings to char*s
-		    QByteArray baArtist = m_pMetaData->getArtist().toLatin1();
-		    QByteArray baTitle = m_pMetaData->getTitle().toLatin1();
-		    
-		    if (baArtist.isEmpty())
-		        baSong = baTitle;
-		    else
-		        baSong = baArtist + " - " + baTitle;
+    if(!m_custom_metadata && !qstrcmp(m_baFormat, "MP3")){
+        if (m_pMetaData != NULL) {
+            // convert QStrings to char*s
+            QByteArray baArtist = m_pMetaData->getArtist().toLatin1();
+            QByteArray baTitle = m_pMetaData->getTitle().toLatin1();
+            
+            if (baArtist.isEmpty())
+                baSong = baTitle;
+            else
+                baSong = baArtist + " - " + baTitle;
 
-			/** Update metadata */
-			shout_metadata_add(m_pShoutMetaData, "song",  baSong.data());
-    		shout_set_metadata(m_pShout, m_pShoutMetaData);
-		}
-	}
+            /** Update metadata */
+            shout_metadata_add(m_pShoutMetaData, "song",  baSong.data());
+                shout_set_metadata(m_pShout, m_pShoutMetaData);
+        }
+    }
     //Otherwise we might use static metadata
-	else{
-		/** If we use static metadata, we only need to call the following line once **/
-		if(m_custom_metadata && !m_firstCall){
-			baSong = m_baCustom_artist + " - " + m_baCustom_title;
-			/** Update metadata */
-			shout_metadata_add(m_pShoutMetaData, "song",  baSong.data());
-    		shout_set_metadata(m_pShout, m_pShoutMetaData);
-			m_firstCall = true;
-		}
-	}
-
-
+    else{
+        /** If we use static metadata, we only need to call the following line once **/
+        if(m_custom_metadata && !m_firstCall){
+            baSong = m_baCustom_artist + " - " + m_baCustom_title;
+            /** Update metadata */
+            shout_metadata_add(m_pShoutMetaData, "song",  baSong.data());
+                shout_set_metadata(m_pShout, m_pShoutMetaData);
+            m_firstCall = true;
+        }
+    }
 }
 /* -------- ------------------------------------------------------
 Purpose: Common error dialog creation code for run-time exceptions
 
=== modified file 'mixxx/src/engine/engineshoutcast.h'
--- mixxx/src/engine/engineshoutcast.h	2010-09-07 07:50:15 +0000
+++ mixxx/src/engine/engineshoutcast.h	2011-03-25 05:39:41 +0000
@@ -66,16 +66,13 @@
     TrackPointer m_pMetaData;
     shout_t *m_pShout;
     shout_metadata_t *m_pShoutMetaData;
-    int m_pMetaDataLife;
+    int m_iMetaDataLife;
     long m_iShoutStatus;
     long m_iShoutFailures;
     ConfigObject<ConfigValue> *m_pConfig;
     Encoder *m_encoder;
     ControlObject* m_pShoutcastNeedUpdateFromPrefs;
     ControlObjectThreadMain* m_pUpdateShoutcastFromPrefs;
-    ControlObjectThread* m_pCrossfader;
-    ControlObjectThread* m_pVolume1;
-    ControlObjectThread* m_pVolume2;
     volatile bool m_bQuit;
     QMutex m_shoutMutex;
     /** static metadata according to prefereneces **/
 
=== modified file 'mixxx/src/playerinfo.cpp'
--- mixxx/src/playerinfo.cpp	2010-10-24 09:50:11 +0000
+++ mixxx/src/playerinfo.cpp	2011-03-25 05:39:41 +0000
@@ -17,6 +17,45 @@
 #include <QMutexLocker>
 
 #include "playerinfo.h"
+#include "controlobject.h"
+#include "controlobjectthread.h"
+#include "engine/enginexfader.h"
+
+PlayerInfo::PlayerInfo()
+{
+    int i;
+    m_iNumDecks = ControlObject::getControl(ConfigKey("[Master]","num_decks"))->get();
+
+    for (i = 1; i <= m_iNumDecks; i++) {
+        QString chan = QString("[Channel%1]").arg(i);
+
+        m_listCOPlay[chan] = new ControlObjectThread(ControlObject::getControl(ConfigKey(chan, "play")));
+        m_listCOVolume[chan] = new ControlObjectThread(ControlObject::getControl(ConfigKey(chan, "volume")));
+        m_listCOOrientation[chan] = new ControlObjectThread(ControlObject::getControl(ConfigKey(chan, "orientation")));
+        m_listCOpregain[chan] = new ControlObjectThread(ControlObject::getControl(ConfigKey(chan, "pregain")));
+    }
+
+    m_COxfader = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Master]","crossfader")));
+}
+
+PlayerInfo::~PlayerInfo()
+{
+    int i;
+
+
+    m_loadedTrackMap.clear();
+
+    for (i = 1; i <= m_iNumDecks; i++) {
+        QString chan = QString("[Channel%1]").arg(i);
+
+        delete m_listCOPlay[chan];
+        delete m_listCOVolume[chan];
+        delete m_listCOOrientation[chan];
+        delete m_listCOpregain[chan];
+    }
+
+    delete m_COxfader;
+}
 
 PlayerInfo &PlayerInfo::Instance()
 {
@@ -24,14 +63,6 @@
     return playerInfo;
 }
 
-PlayerInfo::PlayerInfo() {
-}
-
-PlayerInfo::~PlayerInfo()
-{
-    m_loadedTrackMap.clear();
-}
-
 TrackPointer PlayerInfo::getTrackInfo(QString group)
 {
     QMutexLocker locker(&m_mutex);
@@ -48,3 +79,61 @@
     QMutexLocker locker(&m_mutex);
     m_loadedTrackMap[group] = track;
 }
+
+int PlayerInfo::getCurrentPlayingDeck()
+{
+    QMutexLocker locker(&m_mutex);
+    int MaxVolume = 0;
+    int MaxDeck = 0;
+    int i;
+    
+
+    for (i = 1; i <= m_iNumDecks; i++) {
+        QString chan = QString("[Channel%1]").arg(i);
+        float fvol;
+        float xfl, xfr, xfvol;
+        float dvol;
+        int orient;
+
+        if ( m_listCOPlay[chan]->get() == 0.0 )
+            continue;
+
+        if ( m_listCOpregain[chan]->get() <= 0.5 )
+            continue;
+
+        if ((fvol = m_listCOVolume[chan]->get()) == 0.0 )
+            continue;
+
+        EngineXfader::getXfadeGains(xfl, xfr, m_COxfader->get(), 1.0, 0.0);
+
+        // Orientation goes: left is 0, center is 1, right is 2. 
+        // Leave math out of it...
+        orient = m_listCOOrientation[chan]->get();
+        if ( orient == 0 )
+            xfvol = xfl;
+        else if ( orient == 2 )
+            xfvol = xfr;
+        else
+            xfvol = 1;
+
+        dvol = fvol * xfvol;
+        if ( dvol > MaxVolume ) {
+            MaxDeck = i;
+            MaxVolume = dvol;
+        }
+    }
+
+    return MaxDeck;
+}
+
+TrackPointer PlayerInfo::getCurrentPlayingTrack()
+{
+    int deck = getCurrentPlayingDeck();
+    if ( deck ) {
+        QString chan = QString("[Channel%1]").arg(deck);
+        return getTrackInfo(chan);
+    }
+
+    return TrackPointer();
+}
+
 
=== modified file 'mixxx/src/playerinfo.h'
--- mixxx/src/playerinfo.h	2010-10-24 09:50:11 +0000
+++ mixxx/src/playerinfo.h	2011-03-25 05:39:41 +0000
@@ -21,6 +21,9 @@
 #include <QMutex>
 #include <QMap>
 
+
+class ControlObjectThread;
+
 #include "trackinfoobject.h"
 
 class PlayerInfo : public QObject
@@ -30,13 +33,21 @@
     static PlayerInfo &Instance();
     TrackPointer getTrackInfo(QString group);
     void setTrackInfo(QString group, TrackPointer trackInfoObj);
+    int getCurrentPlayingDeck();
+    TrackPointer getCurrentPlayingTrack();
   private:
     PlayerInfo();
     ~PlayerInfo();
     PlayerInfo(PlayerInfo const&);
     PlayerInfo &operator= (PlayerInfo const&);
     QMutex m_mutex;
+    int m_iNumDecks;
+    ControlObjectThread* m_COxfader;
     QMap<QString, TrackPointer> m_loadedTrackMap;
+    QMap<QString, ControlObjectThread*> m_listCOPlay;
+    QMap<QString, ControlObjectThread*> m_listCOVolume;
+    QMap<QString, ControlObjectThread*> m_listCOOrientation;
+    QMap<QString, ControlObjectThread*> m_listCOpregain;
 };
 
 #endif
 
=== modified file 'mixxx/src/recording/enginerecord.cpp'
--- mixxx/src/recording/enginerecord.cpp	2010-11-01 17:24:48 +0000
+++ mixxx/src/recording/enginerecord.cpp	2011-03-25 05:39:41 +0000
@@ -21,6 +21,7 @@
 #include "configobject.h"
 #include "controlobjectthread.h"
 #include "controlobject.h"
+#include "trackinfoobject.h"
 #include "dlgprefrecord.h"
 #ifdef __SHOUTCAST__
 #include "encodervorbis.h"
@@ -47,10 +48,12 @@
     m_recReady = new ControlObjectThread(m_recReadyCO);
     m_samplerate = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Master]", "samplerate")));
 
+    m_iMetaDataLife = 0;
 }
 
 EngineRecord::~EngineRecord()
 {
+    closeCueFile();
     closeFile();
     if(m_recReadyCO)    delete m_recReadyCO;
     if(m_recReady)      delete m_recReady;
@@ -67,6 +70,8 @@
     m_baTitle = m_config->getValueString(ConfigKey(RECORDING_PREF_KEY, "Title")).toLatin1();
     m_baAuthor = m_config->getValueString(ConfigKey(RECORDING_PREF_KEY, "Author")).toLatin1();
     m_baAlbum = m_config->getValueString(ConfigKey(RECORDING_PREF_KEY, "Album")).toLatin1();
+    m_cuefilename = m_config->getValueString(ConfigKey(RECORDING_PREF_KEY, "CuePath")).toLatin1();
+    m_bCueIsEnabled = m_config->getValueString(ConfigKey(RECORDING_PREF_KEY, "CueEnabled")).toInt();
 
     if(m_encoder){
         delete m_encoder;	//delete m_encoder if it has been initalized (with maybe) different bitrate
@@ -112,8 +117,48 @@
 
 }
 
+/*
+ * Check if the metadata has changed since the previous check.
+ * We also check when was the last check performed to avoid using
+ * too much CPU and as well to avoid changing the metadata during
+ * scratches.
+ */
+bool EngineRecord::metaDataHasChanged()
+{
+    TrackPointer pTrack;
+
+
+    if ( m_iMetaDataLife < 16 ) {
+        m_iMetaDataLife++;
+        return false;
+    }
+    m_iMetaDataLife = 0;
+
+    pTrack = PlayerInfo::Instance().getCurrentPlayingTrack();
+    if ( !pTrack )
+        return false;
+
+    if ( m_pCurrentTrack ) {
+        if ((pTrack->getId() == -1) || (m_pCurrentTrack->getId() == -1)) {
+            if ((pTrack->getArtist() == m_pCurrentTrack->getArtist()) &&
+                (pTrack->getTitle() == m_pCurrentTrack->getArtist())) {
+                return false;
+            }
+        }
+        else if (pTrack->getId() == m_pCurrentTrack->getId()) {
+            return false;
+        }
+    }
+
+    m_pCurrentTrack = pTrack;
+    return true;
+}
+
 void EngineRecord::process(const CSAMPLE * pIn, const CSAMPLE * pOut, const int iBufferSize)
 {
+    // Calculate the latency of this buffer
+    m_dLatency = (double)iBufferSize / m_samplerate->get();
+
     //if recording is disabled
     if(m_recReady->get() == RECORD_OFF){
         if(fileOpen()){
@@ -126,6 +171,12 @@
         if(openFile()){
             qDebug("Setting record flag to: ON");
             m_recReady->slotSet(RECORD_ON);
+            
+            if ( m_bCueIsEnabled ) {
+                openCueFile();
+                m_cuesamplepos = 0;
+                m_cuetrack = 0;
+            }
         }
         else{ //Maybe the encoder could not be initialized
             qDebug("Setting record flag to: OFF");
@@ -139,14 +190,65 @@
                 sf_write_float(m_sndfile, pIn, iBufferSize);
         }
         else{
-            if(!m_encoder) return;
-            //Compress audio. Encoder will call method 'write()' below to write a file stream
-            m_encoder->encodeBuffer(pIn, iBufferSize);
-        }
+            if ( m_encoder) {
+                //Compress audio. Encoder will call method 'write()' below to write a file stream
+                m_encoder->encodeBuffer(pIn, iBufferSize);
+            }
+        }
+
+        if ( m_bCueIsEnabled ) {
+
+            if ( metaDataHasChanged()) {
+                m_cuetrack++;
+                writeCueLine();
+                m_cuefile.flush();
+            }
+            
+            m_cuesamplepos += iBufferSize;
+
+        }
+
   	}
 
-
-}
+}
+
+void EngineRecord::writeCueLine()
+{
+    // account for multiple channels
+    unsigned long samplerate = m_samplerate->get() * 2;
+    // CDDA is specified as having 75 frames a second
+    unsigned long frames = ((unsigned long)
+                                ((m_cuesamplepos / (samplerate / 75)))
+                                    % 75);
+
+    unsigned long seconds =  ((unsigned long)
+                                (m_cuesamplepos / samplerate)
+                                    % 60 );
+
+    unsigned long minutes = m_cuesamplepos / (samplerate * 60);
+
+    m_cuefile.write(QString("  TRACK %1 AUDIO\n")
+            .arg((double)m_cuetrack, 2, 'f', 0, '0')
+        .toLatin1()
+    );
+
+    m_cuefile.write(QString("    TITLE %1\n")
+        .arg(m_pCurrentTrack->getTitle()).toLatin1());
+    m_cuefile.write(QString("    PERFORMER %1\n")
+        .arg(m_pCurrentTrack->getArtist()).toLatin1());
+
+    // Woefully inaccurate (at the seconds level anyways). 
+    // We'd need a signal fired state tracker
+    // for the track detection code.
+    m_cuefile.write(QString("    INDEX 01 %1:%2:%3\n")
+            .arg((double)minutes, 2, 'f', 0, '0')
+            .arg((double)seconds, 2, 'f', 0, '0')
+            .arg((double)frames, 2, 'f', 0, '0')
+        .toLatin1()
+    );
+
+}
+
 /** encoder will call this method to write compressed audio **/
 void EngineRecord::write(unsigned char *header, unsigned char *body,
                          int headerLen, int bodyLen)
@@ -232,9 +334,44 @@
         ErrorDialogHandler::instance()->requestErrorDialog(props);
         return false;
     }
-    return true;
-
-}
+
+    return true;
+}
+
+bool EngineRecord::openCueFile() {
+    if ( m_cuefilename.length() <= 0 )
+    {
+        return false;
+    }
+
+    qDebug() << "Opening Cue File:" << m_cuefilename;
+    m_cuefile.setFileName(m_cuefilename);
+    m_cuefile.open(QIODevice::WriteOnly);
+
+    if ( m_baAuthor.length() > 0 ) {
+        m_cuefile.write(QString("PERFORMER \"%1\"\n")
+                .arg(QString(m_baAuthor).replace(QString("\""), QString("\\\"")))
+            .toLatin1()
+        );
+    }
+
+    if ( m_baTitle.length() > 0 ) {
+        m_cuefile.write(QString("TITLE \"%1\"\n")
+                .arg(QString(m_baTitle).replace(QString("\""), QString("\\\"")))
+            .toLatin1()
+        );
+    }
+
+    m_cuefile.write(QString("FILE \"%1\" %2%3\n")
+            .arg(QString(m_filename).replace(QString("\""), QString("\\\"")))
+            .arg(QString(m_Encoding).toUpper())
+                .arg((m_Encoding == ENCODING_WAVE ? 'E' : ' '))
+        .toLatin1()
+    );
+
+    return true;
+}
+
 void EngineRecord::closeFile(){
     if(m_Encoding == ENCODING_WAVE || m_Encoding == ENCODING_AIFF){
         if(m_sndfile != NULL){
@@ -255,3 +392,8 @@
     }
 }
 
+void EngineRecord::closeCueFile() {
+    if ( m_cuefile.handle() != -1) {
+        m_cuefile.close();
+    }
+}
 
=== modified file 'mixxx/src/recording/enginerecord.h'
--- mixxx/src/recording/enginerecord.h	2010-11-01 17:24:48 +0000
+++ mixxx/src/recording/enginerecord.h	2011-03-25 05:39:41 +0000
@@ -29,6 +29,8 @@
 #include "encoder.h"
 #include "errordialoghandler.h"
 
+#include "trackinfoobject.h"
+
 #define THRESHOLD_REC 2. //high enough that its not triggered by white noise
 
 class ControlLogpotmeter;
@@ -49,8 +51,14 @@
     void closeFile();
     void updateFromPreferences();
     bool fileOpen();
+    bool openCueFile();
+    void closeCueFile();
 
   private:
+    int getActiveTracks();
+    bool metaDataHasChanged();
+    void writeCueLine();
+
     ConfigObject<ConfigValue> *m_config;
     Encoder *m_encoder;
     QByteArray m_OGGquality;
@@ -62,6 +70,7 @@
     QByteArray m_baAlbum;
 
     QFile m_file;
+    QFile m_cuefile;
     QDataStream m_datastream;
     SNDFILE *m_sndfile;
     SF_INFO m_sfInfo;
@@ -70,6 +79,16 @@
     ControlObject* m_recReadyCO;
 
     ControlObjectThread* m_samplerate;
+
+    int m_iMetaDataLife;
+    TrackPointer m_pCurrentTrack;
+    int m_iNumChannels;
+    double m_dLatency;
+
+    QByteArray m_cuefilename;
+    unsigned long m_cuesamplepos;
+    unsigned long m_cuetrack;
+    bool m_bCueIsEnabled;
 };
 
 #endif