projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
patch_change_dialog.cc
diff --git
a/gtk2_ardour/patch_change_dialog.cc
b/gtk2_ardour/patch_change_dialog.cc
index 081604344cb971430eb4fe4acbde78b200bdd63c..9072801c831aa29ff3a554c492572701ae51e9e0 100644
(file)
--- a/
gtk2_ardour/patch_change_dialog.cc
+++ b/
gtk2_ardour/patch_change_dialog.cc
@@
-27,7
+27,6
@@
#include "midi++/midnam_patch.h"
#include "midi++/midnam_patch.h"
-#include "ardour/midi_patch_manager.h"
#include "ardour/beats_frames_converter.h"
#include "ardour/instrument_info.h"
#include "ardour/beats_frames_converter.h"
#include "ardour/instrument_info.h"
@@
-143,7
+142,7
@@
PatchChangeDialog::instrument_info_changed ()
Evoral::PatchChange<Evoral::MusicalTime>
PatchChangeDialog::patch () const
{
Evoral::PatchChange<Evoral::MusicalTime>
PatchChangeDialog::patch () const
{
- Evoral::MusicalTime t =
0
;
+ Evoral::MusicalTime t =
Evoral::MusicalTime()
;
if (_time_converter) {
t = _time_converter->from (_time.current_time ());
if (_time_converter) {
t = _time_converter->from (_time.current_time ());
@@
-286,7
+285,7
@@
PatchChangeDialog::set_active_patch_combo ()
boost::replace_all (n, "_", " ");
MIDI::Name::PatchPrimaryKey const & key = (*j)->patch_primary_key ();
boost::replace_all (n, "_", " ");
MIDI::Name::PatchPrimaryKey const & key = (*j)->patch_primary_key ();
- if (key.program
_number
== _program.get_value() - 1) {
+ if (key.program
()
== _program.get_value() - 1) {
_ignore_signals = true;
_patch_combo.set_active_text (n);
_ignore_signals = false;
_ignore_signals = true;
_patch_combo.set_active_text (n);
_ignore_signals = false;