summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-30 09:03:29 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-30 09:03:29 +0000
commit16268e699ace744c50a040ac4a2de40ab4a9f9d5 (patch)
tree38786becc20ccc4eb1a7af1b01e6e73c5d13f61b
parentcd03ccbd8f3a9fb57c665014f62d779c5c3f8418 (diff)
removed midi in button from score editor (yes, it's really
unneccessary here ;) )
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp27
-rw-r--r--muse2/muse/midiedit/scoreedit.h4
3 files changed, 3 insertions, 29 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index fae1936d..5e2b578f 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,6 +1,7 @@
30.05.2011:
- implemented cut,copy'n'paste and the "select foo" entries in the score editor (flo93)
- added select_foo() functions to functions.cpp (flo93)
+ - removed "midi in" button from score editor (flo93)
29.05.2011:
- moved cut,copy'n'paste to functions.cpp, removed unneccessary duplication (flo93)
- changed behaviour of paste: now the pasted, not the original notes are selected (flo93)
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 7bb4737f..e15e2ec4 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -218,14 +218,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
srec->setIcon(*steprecIcon);
srec->setCheckable(true);
steprec_tools->addWidget(srec);
- connect(srec, SIGNAL(toggled(bool)), SLOT(set_steprec(bool)));
-
- midiin = new QToolButton();
- midiin->setToolTip(tr("Midi Input"));
- midiin->setIcon(*midiinIcon);
- midiin->setCheckable(true);
- steprec_tools->addWidget(midiin);
- connect(midiin, SIGNAL(toggled(bool)), score_canvas, SLOT(set_midiin(bool)));
+ connect(srec, SIGNAL(toggled(bool)), score_canvas, SLOT(set_steprec(bool)));
edit_tools = new EditToolBar(this, PointerTool | PencilTool | RubberTool);
@@ -559,13 +552,6 @@ ScoreEdit::~ScoreEdit()
}
-void ScoreEdit::set_steprec(bool flag)
-{
- score_canvas->set_steprec(flag);
- if (flag == false)
- midiin->setChecked(false);
-}
-
void ScoreEdit::velo_box_changed()
@@ -862,7 +848,6 @@ void ScoreEdit::writeStatus(int level, Xml& xml) const
xml.strTag(level, "name", name);
xml.intTag(level, "tool", edit_tools->curTool());
xml.intTag(level, "steprec", srec->isChecked());
- xml.intTag(level, "midiin", midiin->isChecked());
xml.intTag(level, "quantPower", score_canvas->quant_power2());
xml.intTag(level, "pxPerWhole", score_canvas->pixels_per_whole());
xml.intTag(level, "newNoteVelo", velo_spinbox->value());
@@ -955,8 +940,6 @@ void ScoreEdit::readStatus(Xml& xml)
set_name(xml.parse1());
else if (tag == "tool")
edit_tools->set(xml.parseInt());
- else if (tag == "midiin")
- midiin->setChecked(xml.parseInt());
else if (tag == "steprec")
srec->setChecked(xml.parseInt());
else if (tag == "quantPower")
@@ -1192,7 +1175,6 @@ ScoreCanvas::ScoreCanvas(ScoreEdit* pr, QWidget* parent_widget) : View(parent_wi
init_pixmaps();
srec=false;
- midiin=false;
for (int i=0;i<128;i++) held_notes[i]=false;
steprec=new StepRec(held_notes);
connect(song, SIGNAL(midiNote(int, int)), SLOT(midi_note(int,int)));
@@ -4424,11 +4406,6 @@ void ScoreCanvas::set_steprec(bool flag)
srec=flag;
}
-void ScoreCanvas::set_midiin(bool flag)
-{
- midiin=flag;
-}
-
void ScoreCanvas::midi_note(int pitch, int velo)
{
if (velo)
@@ -4436,7 +4413,7 @@ void ScoreCanvas::midi_note(int pitch, int velo)
else
held_notes[pitch]=false;
- if ( midiin && srec && selected_part && !audio->isPlaying() && velo )
+ if ( srec && selected_part && !audio->isPlaying() && velo )
steprec->record(selected_part,pitch,quant_ticks(),quant_ticks(),velo,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier);
}
diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h
index 603c1c12..cd08d4b0 100644
--- a/muse2/muse/midiedit/scoreedit.h
+++ b/muse2/muse/midiedit/scoreedit.h
@@ -140,7 +140,6 @@ class ScoreEdit : public TopWin
QAction* func_legato_action;
QToolButton* srec;
- QToolButton* midiin;
QScrollBar* xscroll;
QScrollBar* yscroll;
@@ -164,7 +163,6 @@ class ScoreEdit : public TopWin
void menu_command(int);
void velo_box_changed();
void velo_off_box_changed();
- void set_steprec(bool);
void init_shortcuts();
void selection_changed();
void clipboard_changed();
@@ -714,7 +712,6 @@ class ScoreCanvas : public View
bool srec;
- bool midiin;
bool held_notes[128];
enum {COLOR_MODE_BLACK, COLOR_MODE_PART, COLOR_MODE_VELO} coloring_mode;
@@ -765,7 +762,6 @@ class ScoreCanvas : public View
void set_velo_off(int);
void set_steprec(bool);
- void set_midiin(bool);
void update_parts(); //re-populates the set<Part*>s from the set<int>s
signals: