smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

* disabled some debugging output

Browse source 
* make record buttons appear in MIDI mixer strips

git-svn-id: svn://localhost/ardour2/branches/3.0@3280 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2008-04-22 22:39:45 +00:00
parent 7afccaa9fe
commit b81fd9415e
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/mixer_strip.cc
View file

@ -182,12 +182,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
bottom_button_table.attach (group_button, 0, 1, 0, 1);
if (is_audio_track()) {
rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
rec_enable_button->set_name ("MixerRecordEnableButton");
boost::shared_ptr<AudioTrack> at = audio_track();
at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
@ -206,9 +200,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
button_table.attach (speed_frame, 0, 2, 5, 6);
#endif /* VARISPEED_IN_MIXER_STRIP */
}
if(rec_enable_button) {
rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
rec_enable_button->set_name ("MixerRecordEnableButton");
button_table.attach (*rec_enable_button, 0, 2, 2, 3);
}
name_button.add (name_label);
name_button.set_name ("MixerNameButton");
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);

8
libs/ardour/ardour/midi_ring_buffer.h
View file

@ -308,8 +308,8 @@ MidiRingBuffer::read_contents(size_t size, Byte* buf)
inline size_t
MidiRingBuffer::write(double time, size_t size, const Byte* buf)
{
printf("MRB - write %#X %d %d with time %lf\n",
buf[0], buf[1], buf[2], time);
//printf("MRB - write %#X %d %d with time %lf\n",
// buf[0], buf[1], buf[2], time);
assert(size > 0);
@ -358,7 +358,7 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
size_t count = 0;
printf("MRB - read %u .. %u + %u\n", start, end, offset);
//printf("MRB - read %u .. %u + %u\n", start, end, offset);
while (read_space() > sizeof(double) + sizeof(size_t)) {
@ -405,7 +405,7 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
write_loc[0] = (write_loc[0] & 0xF0) | (g_atomic_int_get(&_force_channel) & 0x0F);
}
++count;
printf("MRB - read event at time %lf\n", ev.time());
//printf("MRB - read event at time %lf\n", ev.time());
} else {
std::cerr << "MRB: READ ERROR (data)" << std::endl;
}

8
libs/ardour/midi_buffer.cc
View file

@ -117,7 +117,7 @@ MidiBuffer::read_from(const Buffer& src, nframes_t nframes, nframes_t offset)
for (size_t i=0; i < msrc.size(); ++i) {
const MIDI::Event& ev = msrc[i];
if (ev.time() >= offset && ev.time() < offset+nframes) {
cout << "MidiBuffer::read_from got event, " << int(ev.type()) << " time: " << ev.time() << " buffer size: " << _size << endl;
//cout << "MidiBuffer::read_from got event, " << int(ev.type()) << " time: " << ev.time() << " buffer size: " << _size << endl;
push_back(ev);
} else {
cerr << "MidiBuffer event out of range, " << ev.time() << endl;
@ -148,7 +148,7 @@ MidiBuffer::push_back(const MIDI::Event& ev)
_events[_size].set_buffer(write_loc, false);
++_size;
cerr << "MidiBuffer: pushed, size = " << _size << endl;
//cerr << "MidiBuffer: pushed, size = " << _size << endl;
_silent = false;
@ -177,7 +177,7 @@ MidiBuffer::push_back(const jack_midi_event_t& ev)
_events[_size].set_buffer(write_loc, false);
++_size;
cerr << "MidiBuffer: pushed, size = " << _size << endl;
//cerr << "MidiBuffer: pushed, size = " << _size << endl;
_silent = false;
@ -207,7 +207,7 @@ MidiBuffer::reserve(double time, size_t size)
_events[_size].set_buffer(write_loc, false);
++_size;
cerr << "MidiBuffer: reserved, size = " << _size << endl;
//cerr << "MidiBuffer: reserved, size = " << _size << endl;
_silent = false;