along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
+#include <glibmm/miscutils.h>
#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+
+#include <pbd/enumwriter.h>
+
#include <ardour/audioengine.h>
#include "editor.h"
#include "i18n.h"
+using namespace Gtkmm2ext;
+using namespace PBD;
+
void
Editor::editor_mixer_button_toggled ()
{
}
}
+void
+Editor::editor_list_button_toggled ()
+{
+ Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+ if (act) {
+ Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+ show_editor_list (tact->get_active());
+ }
+}
+
+void
+Editor::cms_new (boost::shared_ptr<ARDOUR::Route> r)
+{
+ current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), *session, r);
+ current_mixer_strip->GoingAway.connect (mem_fun (*this, &Editor::cms_deleted));
+}
+
void
Editor::cms_deleted ()
{
AudioTimeAxisView* atv;
if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
-
- current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
- *session,
- atv->route(), false);
-
- current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
+ cms_new (atv->route ());
break;
}
}
AudioTimeAxisView* atv;
if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
-
- current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
- *session,
- atv->route(), false);
- current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
+ cms_new (atv->route ());
break;
}
}
current_mixer_strip->set_embedded (true);
current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden));
current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed));
- current_mixer_strip->set_width (editor_mixer_strip_width);
-
+ current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this);
+
global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
global_hpacker.reorder_child (*current_mixer_strip, 0);
}
}
+void
+Editor::show_editor_list (bool yn)
+{
+ if (yn) {
+ the_notebook.show();
+ } else {
+ the_notebook.hide();
+ }
+}
+
void
Editor::set_selected_mixer_strip (TimeAxisView& view)
{
- AudioTimeAxisView* at;
+ RouteTimeAxisView* rt;
bool show = false;
- if (!session || (at = dynamic_cast<AudioTimeAxisView*>(&view)) == 0) {
+ if (!session || (rt = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
return;
}
/* might be nothing to do */
- if (current_mixer_strip->route() == at->route()) {
+ if (current_mixer_strip->route() == rt->route()) {
return;
}
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
- at->route());
+ rt->route(), false);
current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
if (show) {
void
Editor::update_current_screen ()
{
- if (session && engine.running()) {
+ if (session && session->engine().running()) {
- nframes_t frame;
+ nframes64_t frame;
frame = session->audible_frame();
/* only update if the playhead is on screen or we are following it */
- if (_follow_playhead) {
+ if (_follow_playhead && session->requested_return_frame() < 0) {
- playhead_cursor->canvas_item.show();
+ //playhead_cursor->canvas_item.show();
if (frame != last_update_frame) {
+
+#undef CONTINUOUS_SCROLL
+#ifndef CONTINUOUS_SCROLL
if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
if (session->transport_speed() < 0) {
playhead_cursor->set_position (frame);
-#define CONTINUOUS_SCROLL
-#ifdef CONTINUOUS_SCROLL
-
+#else // CONTINUOUS_SCROLL
+
/* don't do continuous scroll till the new position is in the rightmost quarter of the
editor canvas
*/
-#if 0
- if (frame > leftmost_frame + (3 * current_page_frames() / 4)) {
-
- if (frame > playhead_cursor->current_frame) {
- nframes_t delta = frame - playhead_cursor->current_frame;
- horizontal_adjustment.set_value (horizontal_adjustment.get_value() + (delta/frames_per_unit));
+ if (session->transport_speed()) {
+ double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit;
+ if (target <= 0.0) target = 0.0;
+ if ( fabs(target - current) < current_page_frames()/frames_per_unit ) {
+ target = (target * 0.15) + (current * 0.85);
} else {
- nframes_t delta = playhead_cursor->current_frame - frame;
- horizontal_adjustment.set_value (horizontal_adjustment.get_value() - (delta/frames_per_unit));
+ /* relax */
}
+ //printf("frame: %d, cpf: %d, fpu: %6.6f, current: %6.6f, target : %6.6f\n", frame, current_page_frames(), frames_per_unit, current, target );
+ current = target;
+ horizontal_adjustment.set_value ( current );
}
-#else
- if (!currentInitialized) {
- current = (frame - current_page_frames()/2) / frames_per_unit;
- currentInitialized = 1;
- }
-
- double target = (frame - current_page_frames()/2) / frames_per_unit;
- target = (target * 0.1) + (current * 0.9);
- horizontal_adjustment.set_value ( target );
- current = target;
-#endif
+
+ playhead_cursor->set_position (frame);
#endif // CONTINUOUS_SCROLL
} else {
if (frame != last_update_frame) {
- if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
- playhead_cursor->canvas_item.hide();
- } else {
- playhead_cursor->set_position (frame);
- }
+ playhead_cursor->set_position (frame);
}
}
almost_done:
last_update_frame = frame;
-
+#ifdef GTKOSX
+ /*XXX in a perfect world we would not have to do this. */
+ track_canvas->update_now();
+#endif
if (current_mixer_strip) {
current_mixer_strip->fast_update ();
}
void
Editor::session_going_away ()
{
+ _have_idled = false;
+
for (vector<sigc::connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
(*i).disconnect ();
}
cut_buffer->clear ();
clicked_regionview = 0;
- clicked_trackview = 0;
- clicked_audio_trackview = 0;
+ clicked_axisview = 0;
+ clicked_routeview = 0;
clicked_crossfadeview = 0;
entered_regionview = 0;
entered_track = 0;
- latest_regionview = 0;
last_update_frame = 0;
drag_info.item = 0;
last_canvas_frame = 0;
+ playhead_cursor->canvas_item.hide ();
+
/* hide all tracks */
hide_all_tracks (false);
named_selection_display.set_model (named_selection_model);
edit_group_display.set_model (group_model);
- edit_cursor_clock.set_session (0);
+ edit_point_clock_connection_a.disconnect();
+ edit_point_clock_connection_b.disconnect();
+
+ edit_point_clock.set_session (0);
zoom_range_clock.set_session (0);
nudge_clock.set_session (0);
editor_mixer_button.set_active(false);
editor_mixer_button.set_sensitive(false);
+ editor_list_button.set_active(false);
+ editor_list_button.set_sensitive(false);
+
/* clear tempo/meter rulers */
-
remove_metric_marks ();
hide_measures ();
clear_marker_display ();
current_mixer_strip = 0;
- set_title (_("ardour: editor"));
+ WindowTitle title(Glib::get_application_name());
+ title += _("Editor");
+
+ set_title (title.get_string());
session = 0;
}
+
+void
+Editor::maybe_add_mixer_strip_width (XMLNode& node)
+{
+ if (current_mixer_strip) {
+ node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width()));
+ }
+}
+
projects / ardour.git / blobdiff