hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove unused code

Browse Source 
And some improvements
This commit is contained in:
Hussam Eddin Alhomsi
2018-03-31 13:23:01 +03:00
parent 8fa33a8970
commit 9e23b2a03b
9 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/GrooveExperiments.h
View File

@@ -50,8 +50,8 @@ public:
~GrooveExperimentsView();
public slots:
void valueChanged();
void modelChanged();
void valueChanged(int);
private:
GrooveExperiments * m_groove;

8
include/GrooveView.h
View File

@@ -4,10 +4,8 @@
#define GROOVEVIEW_H
#include <QWidget>
#include <QCloseEvent>
#include <QComboBox>
#include <QVBoxLayout>
#include <QComboBox>
#include "Groove.h"
#include "SerializingObject.h"
@@ -25,13 +23,13 @@ signals:
public slots:
void update();
void grooveChanged(int index);
void grooveChanged();
private:
void setView(Groove * groove);
QComboBox * m_comboBox;
QVBoxLayout * m_layout;
QComboBox * m_comboBox;
};
#endif // GROOVEVIEW_H

2
include/HalfSwing.h
View File

@@ -48,8 +48,8 @@ public:
~HalfSwingView();
public slots:
void valueChanged();
void modelChanged();
void valueChanged(int);
private:
HalfSwing * m_swing;

2
include/HydrogenSwing.h
View File

@@ -50,8 +50,8 @@ public:
~HydrogenSwingView();
public slots:
void valueChanged();
void modelChanged();
void valueChanged(int value);
private:
HydrogenSwing * m_swing;

4
include/MidiSwing.h
View File

@@ -32,10 +32,6 @@ public:
QWidget * instantiateView(QWidget * parent);
signals:
public slots:
};
#endif // MIDISWING_H

14
src/core/GrooveExperiments.cpp
View File

@@ -22,10 +22,8 @@
*
*/
#include <QObject>
#include <QDomElement>
#include <QLabel>
//#include "AutomatableSlider.h"
#include "Engine.h"
#include "Groove.h"
#include "GrooveExperiments.h"
@@ -136,16 +134,16 @@ GrooveExperimentsView::GrooveExperimentsView(GrooveExperiments * groove, QWidget
QWidget(parent)
{
m_sliderModel = new IntModel(0, 0, 127); // Unused
m_sliderModel->setValue(groove->amount());
m_slider = new AutomatableSlider(this, tr("Swinginess"));
m_slider->setOrientation(Qt::Horizontal);
m_slider->setFixedSize(90, 26);
m_slider->setPageStep(1);
m_slider->setModel(m_sliderModel);
m_sliderModel->setValue(groove->amount());
m_groove = groove;
connect(m_slider, SIGNAL(sliderMoved(int)), this, SLOT(valueChanged(int)));
connect(m_slider, SIGNAL(sliderMoved()), this, SLOT(valueChanged()));
connect(m_sliderModel, SIGNAL(dataChanged()), this, SLOT(modelChanged()));
}
@@ -155,12 +153,12 @@ GrooveExperimentsView::~GrooveExperimentsView()
delete m_sliderModel;
}
void GrooveExperimentsView::modelChanged()
void GrooveExperimentsView::valueChanged()
{
m_groove->setAmount((int)m_sliderModel->value());
m_groove->setAmount(m_sliderModel->value());
}
void GrooveExperimentsView::valueChanged(int _i) // this value passed is gibberish
void GrooveExperimentsView::modelChanged()
{
m_groove->setAmount((int)m_sliderModel->value());
m_groove->setAmount(m_sliderModel->value());
}

14
src/core/HalfSwing.cpp
View File

@@ -23,10 +23,8 @@
*
*/
#include <QObject>
#include <QDomElement>
#include <QLabel>
//#include "AutomatableSlider.h"
#include "Engine.h"
#include "Groove.h"
#include "HalfSwing.h"
@@ -144,16 +142,16 @@ HalfSwingView::HalfSwingView(HalfSwing * halfSwing, QWidget * parent) :
QWidget(parent)
{
m_sliderModel = new IntModel(0, 0, 127); // Unused
m_sliderModel->setValue(halfSwing->amount());
m_slider = new AutomatableSlider(this, tr("Swinginess"));
m_slider->setOrientation(Qt::Horizontal);
m_slider->setFixedSize(90, 26);
m_slider->setPageStep(1);
m_slider->setModel(m_sliderModel);
m_sliderModel->setValue(halfSwing->amount());
m_swing = halfSwing;
connect(m_slider, SIGNAL(sliderMoved(int)), this, SLOT(valueChanged(int)));
connect(m_slider, SIGNAL(sliderMoved()), this, SLOT(valueChanged()));
connect(m_sliderModel, SIGNAL(dataChanged()), this, SLOT(modelChanged()));
}
@@ -163,12 +161,12 @@ HalfSwingView::~HalfSwingView()
delete m_sliderModel;
}
void HalfSwingView::modelChanged()
void HalfSwingView::valueChanged()
{
m_swing->setAmount((int)m_sliderModel->value());
m_swing->setAmount(m_sliderModel->value());
}
void HalfSwingView::valueChanged(int _i) // this value passed is gibberish
void HalfSwingView::modelChanged()
{
m_swing->setAmount((int)m_sliderModel->value());
m_swing->setAmount(m_sliderModel->value());
}

14
src/core/HydrogenSwing.cpp
View File

@@ -23,10 +23,8 @@
*
*/
#include <QObject>
#include <QDomElement>
#include <QLabel>
//#include "AutomatableSlider.h"
#include "Engine.h"
#include "Groove.h"
#include "HydrogenSwing.h"
@@ -146,16 +144,16 @@ HydrogenSwingView::HydrogenSwingView(HydrogenSwing * swing, QWidget * parent) :
QWidget(parent)
{
m_sliderModel = new IntModel(0, 0, 127); // Unused
m_sliderModel->setValue(swing->amount());
m_slider = new AutomatableSlider(this, tr("Swinginess"));
m_slider->setOrientation(Qt::Horizontal);
m_slider->setFixedSize(90, 26);
m_slider->setPageStep(1);
m_slider->setModel(m_sliderModel);
m_sliderModel->setValue(swing->amount());
m_swing = swing;
connect(m_slider, SIGNAL(sliderMoved(int)), this, SLOT(valueChanged(int)));
connect(m_slider, SIGNAL(sliderMoved()), this, SLOT(valueChanged()));
connect(m_sliderModel, SIGNAL(dataChanged()), this, SLOT(modelChanged()));
}
@@ -165,12 +163,12 @@ HydrogenSwingView::~HydrogenSwingView()
delete m_sliderModel;
}
void HydrogenSwingView::modelChanged()
void HydrogenSwingView::valueChanged()
{
m_swing->setAmount((int)m_sliderModel->value());
m_swing->setAmount(m_sliderModel->value());
}
void HydrogenSwingView::valueChanged(int value) // this value passed is gibberish
void HydrogenSwingView::modelChanged()
{
m_swing->setAmount((int)m_sliderModel->value());
m_swing->setAmount(m_sliderModel->value());
}

19
src/gui/widgets/GrooveView.cpp
View File

@@ -1,13 +1,4 @@
#include <QApplication>
#include <QLayout>
#include <QPushButton>
#include <QScrollArea>
#include <QVBoxLayout>
#include <QMdiArea>
#include <QDomElement>
#include "embed.h"
#include "Engine.h"
#include "MainWindow.h"
@@ -38,8 +29,8 @@ GrooveView::GrooveView(QWidget * parent) :
m_layout->addWidget(m_comboBox);
m_layout->addWidget(new QLabel(""));
connect(m_comboBox, SIGNAL(activated(int)),
this, SLOT(grooveChanged(int)));
connect(m_comboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(grooveChanged()));
connect(Engine::getSong(), SIGNAL(dataChanged()),
this, SLOT(update()));
@@ -90,12 +81,12 @@ void GrooveView::clear()
m_layout->addWidget(new QLabel(""));
}
void GrooveView::grooveChanged(int index)
void GrooveView::grooveChanged()
{
Groove * groove = NULL;
int selectedIdx = m_comboBox->currentIndex();
switch (selectedIdx) {
int currentIndex = m_comboBox->currentIndex();
switch (currentIndex) {
case 0 :
{
groove = new Groove();