Pattern: removed freeze functionality

Since addition of automation, controllers etc. the freeze functionality
has been rather broken and thus adds no value anymore. In order to not
confuse users with broken functionality, remove it at all.

Closes #345.
This commit is contained in:
Tobias Doerffel
2014-02-19 19:07:47 +01:00
parent 7d965e251c
commit 8b84526dc5
9 changed files with 25 additions and 466 deletions

View File

@@ -30,7 +30,6 @@
#include "AutomatableModel.h"
class bbTrack;
class pattern;
class SampleTCO;
class track;
class AudioPort;
@@ -42,7 +41,6 @@ public:
SamplePlayHandle( const QString& sampleFile );
SamplePlayHandle( SampleBuffer* sampleBuffer );
SamplePlayHandle( SampleTCO* tco );
SamplePlayHandle( pattern * _pattern );
virtual ~SamplePlayHandle();
virtual inline bool affinityMatters() const

View File

@@ -42,7 +42,6 @@ class QProgressBar;
class QPushButton;
class InstrumentTrack;
class patternFreezeThread;
class SampleBuffer;
@@ -93,22 +92,6 @@ public:
void checkType();
// functions which are part of freezing-feature
inline bool isFreezing() const
{
return m_freezing;
}
inline bool isFrozen() const
{
return m_frozenPattern != NULL;
}
SampleBuffer *frozenPattern()
{
return m_frozenPattern;
}
// settings-management
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
@@ -140,9 +123,6 @@ protected slots:
void addSteps();
void removeSteps();
void clear();
void freeze();
void unfreeze();
void abortFreeze();
void changeTimeSignature();
@@ -155,14 +135,7 @@ private:
NoteVector m_notes;
int m_steps;
// pattern freezing
SampleBuffer* m_frozenPattern;
bool m_freezing;
volatile bool m_freezeAborted;
friend class patternView;
friend class patternFreezeThread;
friend class bbEditor;
} ;
@@ -206,7 +179,6 @@ private:
static QPixmap * s_stepBtnOverlay;
static QPixmap * s_stepBtnOff;
static QPixmap * s_stepBtnOffLight;
static QPixmap * s_frozen;
pattern * m_pat;
QPixmap m_paintPixmap;
@@ -216,64 +188,4 @@ private:
// TODO: move to own header-files
//
class patternFreezeStatusDialog : public QDialog
{
Q_OBJECT
public:
patternFreezeStatusDialog( QThread * _thread );
virtual ~patternFreezeStatusDialog();
void setProgress( int _p );
protected:
void closeEvent( QCloseEvent * _ce );
protected slots:
void cancelBtnClicked();
void updateProgress();
private:
QProgressBar * m_progressBar;
QPushButton * m_cancelBtn;
QThread * m_freezeThread;
int m_progress;
signals:
void aborted();
} ;
class patternFreezeThread : public QThread
{
public:
patternFreezeThread( pattern * _pattern );
virtual ~patternFreezeThread();
protected:
virtual void run();
private:
pattern * m_pattern;
patternFreezeStatusDialog * m_statusDlg;
} ;
#endif

View File

@@ -150,8 +150,6 @@ public:
return m_playing == false && m_paused == false;
}
bool isFreezingPattern() const;
inline bool isExporting() const
{
return m_exporting;
@@ -167,8 +165,6 @@ public:
return m_recording;
}
bool realTimeTask() const;
inline bool isExportDone() const
{
if ( m_exportLoop )