2005-09-25 14:42:24 -04:00
|
|
|
/*
|
|
|
|
Copyright (C) 2002 Paul Davis
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <cstdio> // for sprintf, grrr
|
|
|
|
#include <cstdlib>
|
|
|
|
#include <cmath>
|
|
|
|
#include <string>
|
|
|
|
#include <climits>
|
|
|
|
|
2006-03-07 01:23:12 -05:00
|
|
|
#include <libgnomecanvasmm.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include <pbd/error.h>
|
2006-08-09 21:22:45 -04:00
|
|
|
#include <pbd/memento_command.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
#include <gtkmm2ext/utils.h>
|
|
|
|
#include <gtkmm2ext/gtk_ui.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include <ardour/session.h>
|
|
|
|
#include <ardour/tempo.h>
|
2005-09-25 16:33:00 -04:00
|
|
|
#include <gtkmm2ext/doi.h>
|
2005-12-08 13:53:43 -05:00
|
|
|
#include <gtkmm2ext/utils.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include "editor.h"
|
|
|
|
#include "marker.h"
|
2005-11-27 17:35:04 -05:00
|
|
|
#include "simpleline.h"
|
2005-09-25 14:42:24 -04:00
|
|
|
#include "tempo_dialog.h"
|
|
|
|
#include "rgb_macros.h"
|
|
|
|
#include "gui_thread.h"
|
2006-10-21 15:01:50 -04:00
|
|
|
#include "time_axis_view.h"
|
2007-06-29 13:13:09 -04:00
|
|
|
#include "ardour_ui.h"
|
2008-09-23 10:36:26 -04:00
|
|
|
#include "tempo_lines.h"
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
|
|
|
using namespace std;
|
2005-09-25 16:33:00 -04:00
|
|
|
using namespace sigc;
|
2005-09-25 14:42:24 -04:00
|
|
|
using namespace ARDOUR;
|
Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
|
|
|
using namespace PBD;
|
2005-09-25 14:42:24 -04:00
|
|
|
using namespace Gtk;
|
2005-12-08 13:53:43 -05:00
|
|
|
using namespace Gtkmm2ext;
|
2005-09-25 14:42:24 -04:00
|
|
|
using namespace Editing;
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::remove_metric_marks ()
|
|
|
|
{
|
|
|
|
/* don't delete these while handling events, just punt till the GUI is idle */
|
|
|
|
|
|
|
|
for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
|
|
|
|
delete_when_idle (*x);
|
|
|
|
}
|
|
|
|
metric_marks.clear ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::draw_metric_marks (const Metrics& metrics)
|
|
|
|
{
|
2006-08-30 22:28:42 -04:00
|
|
|
|
2007-06-15 18:08:27 -04:00
|
|
|
const MeterSection *ms;
|
2006-08-30 22:28:42 -04:00
|
|
|
const TempoSection *ts;
|
|
|
|
char buf[64];
|
|
|
|
|
|
|
|
remove_metric_marks ();
|
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
|
|
|
|
|
|
|
|
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
|
|
|
|
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
|
2007-06-29 13:13:09 -04:00
|
|
|
metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
|
2005-11-24 09:59:36 -05:00
|
|
|
*(const_cast<MeterSection*>(ms))));
|
2005-09-25 14:42:24 -04:00
|
|
|
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
|
|
|
|
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
|
2007-06-29 13:13:09 -04:00
|
|
|
metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
|
2005-11-24 09:59:36 -05:00
|
|
|
*(const_cast<TempoSection*>(ts))));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2006-08-30 22:28:42 -04:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2007-04-12 19:20:37 -04:00
|
|
|
Editor::tempo_map_changed (Change ignored)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
2006-11-19 11:45:16 -05:00
|
|
|
if (!session) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-02-21 14:51:41 -05:00
|
|
|
ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
|
2008-09-23 18:23:39 -04:00
|
|
|
if (tempo_lines)
|
|
|
|
tempo_lines->tempo_map_changed();
|
|
|
|
|
2008-10-19 03:55:42 -04:00
|
|
|
compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames());
|
2008-12-12 09:43:24 -05:00
|
|
|
session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
|
2008-09-23 18:23:39 -04:00
|
|
|
redraw_measures ();
|
2007-04-12 19:20:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::redisplay_tempo (bool immediate_redraw)
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
{
|
|
|
|
if (!session) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-10-19 03:55:42 -04:00
|
|
|
compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
|
2008-12-12 09:43:24 -05:00
|
|
|
compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
|
|
|
|
if (immediate_redraw) {
|
|
|
|
redraw_measures ();
|
|
|
|
} else {
|
|
|
|
#ifdef GTKOSX
|
|
|
|
redraw_measures ();
|
|
|
|
#else
|
|
|
|
Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
update_tempo_based_rulers (); // redraw rulers and measures
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
|
2007-04-12 19:20:37 -04:00
|
|
|
{
|
|
|
|
if (!session) {
|
|
|
|
return;
|
|
|
|
}
|
2006-09-18 23:29:16 -04:00
|
|
|
|
|
|
|
BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
|
|
|
|
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
session->bbt_time(leftmost, previous_beat);
|
|
|
|
session->bbt_time(rightmost, next_beat);
|
2006-09-18 23:29:16 -04:00
|
|
|
|
|
|
|
if (previous_beat.beats > 1) {
|
2008-09-23 13:53:52 -04:00
|
|
|
previous_beat.beats -= 1;
|
2006-09-18 23:29:16 -04:00
|
|
|
} else if (previous_beat.bars > 1) {
|
2008-09-23 13:53:52 -04:00
|
|
|
previous_beat.bars--;
|
2006-09-18 23:29:16 -04:00
|
|
|
previous_beat.beats += 1;
|
|
|
|
}
|
|
|
|
previous_beat.ticks = 0;
|
|
|
|
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
if (session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) {
|
2006-11-19 11:45:16 -05:00
|
|
|
next_beat.beats += 1;
|
2006-09-18 23:29:16 -04:00
|
|
|
} else {
|
2006-11-19 11:45:16 -05:00
|
|
|
next_beat.bars += 1;
|
|
|
|
next_beat.beats = 1;
|
2006-09-18 23:29:16 -04:00
|
|
|
}
|
|
|
|
next_beat.ticks = 0;
|
2006-11-19 11:45:16 -05:00
|
|
|
|
2008-12-18 14:31:00 -05:00
|
|
|
delete current_bbt_points;
|
|
|
|
current_bbt_points = 0;
|
2005-09-25 14:42:24 -04:00
|
|
|
|
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 09:32:24 -04:00
|
|
|
current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::hide_measures ()
|
|
|
|
{
|
2008-09-23 10:36:26 -04:00
|
|
|
if (tempo_lines)
|
|
|
|
tempo_lines->hide();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
2006-09-18 23:29:16 -04:00
|
|
|
bool
|
2007-08-05 17:31:02 -04:00
|
|
|
Editor::redraw_measures ()
|
2006-09-18 23:29:16 -04:00
|
|
|
{
|
|
|
|
draw_measures ();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
void
|
|
|
|
Editor::draw_measures ()
|
|
|
|
{
|
2008-03-17 16:54:03 -04:00
|
|
|
if (session == 0 || _show_measures == false ||
|
|
|
|
!current_bbt_points || current_bbt_points->empty()) {
|
2005-09-25 14:42:24 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-09-23 10:36:26 -04:00
|
|
|
if (tempo_lines == 0) {
|
2008-10-14 09:35:17 -04:00
|
|
|
tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
|
2008-09-10 17:27:39 -04:00
|
|
|
}
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2008-09-23 10:36:26 -04:00
|
|
|
tempo_lines->draw(*current_bbt_points, frames_per_unit);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-09-10 11:03:30 -04:00
|
|
|
Editor::mouse_add_new_tempo_event (nframes64_t frame)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
if (session == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
TempoMap& map(session->tempo_map());
|
|
|
|
TempoDialog tempo_dialog (map, frame, _("add"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2008-02-01 22:57:35 -05:00
|
|
|
//this causes compiz to display no border.
|
|
|
|
//tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (tempo_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (tempo_dialog.run()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
double bpm = 0;
|
|
|
|
BBT_Time requested;
|
|
|
|
|
|
|
|
bpm = tempo_dialog.get_bpm ();
|
2008-01-10 16:20:59 -05:00
|
|
|
double nt = tempo_dialog.get_note_type();
|
2005-11-27 16:17:41 -05:00
|
|
|
bpm = max (0.01, bpm);
|
|
|
|
|
|
|
|
tempo_dialog.get_bbt_time (requested);
|
|
|
|
|
|
|
|
begin_reversible_command (_("add tempo mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = map.get_state();
|
2008-01-10 16:20:59 -05:00
|
|
|
map.add_tempo (Tempo (bpm,nt), requested);
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &after = map.get_state();
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
|
2005-11-27 16:17:41 -05:00
|
|
|
commit_reversible_command ();
|
|
|
|
|
2008-02-01 22:57:35 -05:00
|
|
|
//map.dump (cerr);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-09-10 11:03:30 -04:00
|
|
|
Editor::mouse_add_new_meter_event (nframes64_t frame)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
if (session == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TempoMap& map(session->tempo_map());
|
|
|
|
MeterDialog meter_dialog (map, frame, _("add"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2008-02-01 22:57:35 -05:00
|
|
|
|
|
|
|
//this causes compiz to display no border..
|
|
|
|
//meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (meter_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (meter_dialog.run ()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
double bpb = meter_dialog.get_bpb ();
|
|
|
|
bpb = max (1.0, bpb); // XXX is this a reasonable limit?
|
|
|
|
|
|
|
|
double note_type = meter_dialog.get_note_type ();
|
|
|
|
BBT_Time requested;
|
2008-02-01 22:57:35 -05:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
meter_dialog.get_bbt_time (requested);
|
2008-02-01 22:57:35 -05:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
begin_reversible_command (_("add meter mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = map.get_state();
|
2005-11-27 16:17:41 -05:00
|
|
|
map.add_meter (Meter (bpb, note_type), requested);
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
|
2005-11-27 16:17:41 -05:00
|
|
|
commit_reversible_command ();
|
|
|
|
|
2008-02-01 22:57:35 -05:00
|
|
|
//map.dump (cerr);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::remove_tempo_marker (ArdourCanvas::Item* item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
TempoMarker* tempo_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
|
|
|
|
fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tempo_marker->tempo().movable()) {
|
2005-10-06 00:59:20 -04:00
|
|
|
Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::edit_meter_section (MeterSection* section)
|
|
|
|
{
|
|
|
|
MeterDialog meter_dialog (*section, _("done"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (meter_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (meter_dialog.run()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
double bpb = meter_dialog.get_bpb ();
|
|
|
|
bpb = max (1.0, bpb); // XXX is this a reasonable limit?
|
|
|
|
|
|
|
|
double note_type = meter_dialog.get_note_type ();
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
begin_reversible_command (_("replace tempo mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = session->tempo_map().get_state();
|
2005-11-27 16:17:41 -05:00
|
|
|
session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &after = session->tempo_map().get_state();
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
|
2005-11-27 16:17:41 -05:00
|
|
|
commit_reversible_command ();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::edit_tempo_section (TempoSection* section)
|
|
|
|
{
|
|
|
|
TempoDialog tempo_dialog (*section, _("done"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (tempo_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (tempo_dialog.run ()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
double bpm = tempo_dialog.get_bpm ();
|
2008-01-10 16:20:59 -05:00
|
|
|
double nt = tempo_dialog.get_note_type ();
|
2005-11-27 16:17:41 -05:00
|
|
|
BBT_Time when;
|
|
|
|
tempo_dialog.get_bbt_time(when);
|
|
|
|
bpm = max (0.01, bpm);
|
|
|
|
|
2008-02-02 12:22:04 -05:00
|
|
|
cerr << "Editing tempo section to be at " << when << endl;
|
|
|
|
session->tempo_map().dump (cerr);
|
2005-11-27 16:17:41 -05:00
|
|
|
begin_reversible_command (_("replace tempo mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = session->tempo_map().get_state();
|
2008-01-10 16:20:59 -05:00
|
|
|
session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
|
2008-02-02 12:22:04 -05:00
|
|
|
session->tempo_map().dump (cerr);
|
2005-11-27 16:17:41 -05:00
|
|
|
session->tempo_map().move_tempo (*section, when);
|
2008-02-02 12:22:04 -05:00
|
|
|
session->tempo_map().dump (cerr);
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &after = session->tempo_map().get_state();
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
|
2005-11-27 16:17:41 -05:00
|
|
|
commit_reversible_command ();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::edit_tempo_marker (ArdourCanvas::Item *item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
TempoMarker* tempo_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
|
|
|
|
fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
edit_tempo_section (&tempo_marker->tempo());
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::edit_meter_marker (ArdourCanvas::Item *item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
MeterMarker* meter_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
|
|
|
|
fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
edit_meter_section (&meter_marker->meter());
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
Editor::real_remove_tempo_marker (TempoSection *section)
|
|
|
|
{
|
|
|
|
begin_reversible_command (_("remove tempo mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = session->tempo_map().get_state();
|
2005-09-25 14:42:24 -04:00
|
|
|
session->tempo_map().remove_tempo (*section);
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &after = session->tempo_map().get_state();
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
|
2005-09-25 14:42:24 -04:00
|
|
|
commit_reversible_command ();
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::remove_meter_marker (ArdourCanvas::Item* item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
MeterMarker* meter_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
|
|
|
|
fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
|
|
|
|
/*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (meter_marker->meter().movable()) {
|
2005-10-06 00:59:20 -04:00
|
|
|
Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
Editor::real_remove_meter_marker (MeterSection *section)
|
|
|
|
{
|
|
|
|
begin_reversible_command (_("remove tempo mark"));
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &before = session->tempo_map().get_state();
|
2005-09-25 14:42:24 -04:00
|
|
|
session->tempo_map().remove_meter (*section);
|
2006-08-09 21:22:45 -04:00
|
|
|
XMLNode &after = session->tempo_map().get_state();
|
2006-08-24 03:37:17 -04:00
|
|
|
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
|
2005-09-25 14:42:24 -04:00
|
|
|
commit_reversible_command ();
|
2006-08-30 22:28:42 -04:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
return FALSE;
|
|
|
|
}
|