remove CMT code - has not been used for years, and will become irrelevant with VTL and cairocanvas
This commit is contained in:
parent
7df1654947
commit
81485faa83
|
@ -142,17 +142,6 @@ ARDOUR_UI::install_actions ()
|
||||||
sigc::mem_fun (*editor, &PublicEditor::export_video));
|
sigc::mem_fun (*editor, &PublicEditor::export_video));
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
|
|
||||||
std::string anicomp_file_path;
|
|
||||||
|
|
||||||
if (PBD::find_file_in_search_path (Glib::getenv("PATH"), "AniComp", anicomp_file_path)) {
|
|
||||||
act = ActionManager::register_action (main_actions, X_("aniConnect"), _("Connect"), (sigc::mem_fun (*editor, &PublicEditor::connect_to_image_compositor)));
|
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
|
act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false));
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
ActionManager::write_sensitive_actions.push_back (act);
|
ActionManager::write_sensitive_actions.push_back (act);
|
||||||
|
|
|
@ -119,10 +119,6 @@
|
||||||
|
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
#include "imageframe_socket_handler.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
using namespace PBD;
|
using namespace PBD;
|
||||||
|
@ -266,10 +262,6 @@ Editor::Editor ()
|
||||||
|
|
||||||
, _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10)))
|
, _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10)))
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
, image_socket_listener(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* nudge */
|
/* nudge */
|
||||||
|
|
||||||
, nudge_clock (new AudioClock (X_("nudge"), false, X_("nudge"), true, false, true))
|
, nudge_clock (new AudioClock (X_("nudge"), false, X_("nudge"), true, false, true))
|
||||||
|
@ -767,18 +759,6 @@ Editor::Editor ()
|
||||||
|
|
||||||
Editor::~Editor()
|
Editor::~Editor()
|
||||||
{
|
{
|
||||||
#ifdef WITH_CMT
|
|
||||||
if(image_socket_listener) {
|
|
||||||
if(image_socket_listener->is_connected())
|
|
||||||
{
|
|
||||||
image_socket_listener->close_connection() ;
|
|
||||||
}
|
|
||||||
|
|
||||||
delete image_socket_listener ;
|
|
||||||
image_socket_listener = 0 ;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
delete button_bindings;
|
delete button_bindings;
|
||||||
delete _routes;
|
delete _routes;
|
||||||
delete _route_groups;
|
delete _route_groups;
|
||||||
|
|
|
@ -137,16 +137,6 @@ class EditorCursor;
|
||||||
class MouseCursors;
|
class MouseCursors;
|
||||||
class VerboseCursor;
|
class VerboseCursor;
|
||||||
|
|
||||||
/* <CMT Additions> */
|
|
||||||
class ImageFrameView;
|
|
||||||
class ImageFrameTimeAxisView;
|
|
||||||
class ImageFrameTimeAxis;
|
|
||||||
class MarkerTimeAxis ;
|
|
||||||
class MarkerView ;
|
|
||||||
class ImageFrameSocketHandler ;
|
|
||||||
class TimeAxisViewItem ;
|
|
||||||
/* </CMT Additions> */
|
|
||||||
|
|
||||||
class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker
|
class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1115,31 +1115,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
case ImageFrameHandleStartItem:
|
|
||||||
imageframe_start_handle_op(item, event) ;
|
|
||||||
return(true) ;
|
|
||||||
break ;
|
|
||||||
case ImageFrameHandleEndItem:
|
|
||||||
imageframe_end_handle_op(item, event) ;
|
|
||||||
return(true) ;
|
|
||||||
break ;
|
|
||||||
case MarkerViewHandleStartItem:
|
|
||||||
markerview_item_start_handle_op(item, event) ;
|
|
||||||
return(true) ;
|
|
||||||
break ;
|
|
||||||
case MarkerViewHandleEndItem:
|
|
||||||
markerview_item_end_handle_op(item, event) ;
|
|
||||||
return(true) ;
|
|
||||||
break ;
|
|
||||||
case MarkerViewItem:
|
|
||||||
start_markerview_grab(item, event) ;
|
|
||||||
break ;
|
|
||||||
case ImageFrameItem:
|
|
||||||
start_imageframe_grab(item, event) ;
|
|
||||||
break ;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case MarkerBarItem:
|
case MarkerBarItem:
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -1576,21 +1551,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
||||||
popup_control_point_context_menu (item, event);
|
popup_control_point_context_menu (item, event);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
case ImageFrameItem:
|
|
||||||
popup_imageframe_edit_menu(1, event->button.time, item, true) ;
|
|
||||||
break ;
|
|
||||||
case ImageFrameTimeAxisItem:
|
|
||||||
popup_imageframe_edit_menu(1, event->button.time, item, false) ;
|
|
||||||
break ;
|
|
||||||
case MarkerViewItem:
|
|
||||||
popup_marker_time_axis_edit_menu(1, event->button.time, item, true) ;
|
|
||||||
break ;
|
|
||||||
case MarkerTimeAxisItem:
|
|
||||||
popup_marker_time_axis_edit_menu(1, event->button.time, item, false) ;
|
|
||||||
break ;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1869,19 +1829,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case StartSelectionTrimItem:
|
case StartSelectionTrimItem:
|
||||||
#ifdef WITH_CMT
|
|
||||||
case ImageFrameHandleStartItem:
|
|
||||||
case MarkerViewHandleStartItem:
|
|
||||||
#endif
|
|
||||||
if (is_drawable()) {
|
if (is_drawable()) {
|
||||||
set_canvas_cursor (_cursors->left_side_trim);
|
set_canvas_cursor (_cursors->left_side_trim);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case EndSelectionTrimItem:
|
case EndSelectionTrimItem:
|
||||||
#ifdef WITH_CMT
|
|
||||||
case ImageFrameHandleEndItem:
|
|
||||||
case MarkerViewHandleEndItem:
|
|
||||||
#endif
|
|
||||||
if (is_drawable()) {
|
if (is_drawable()) {
|
||||||
set_canvas_cursor (_cursors->right_side_trim);
|
set_canvas_cursor (_cursors->right_side_trim);
|
||||||
}
|
}
|
||||||
|
@ -2055,13 +2007,6 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
|
||||||
case EndSelectionTrimItem:
|
case EndSelectionTrimItem:
|
||||||
case PlayheadCursorItem:
|
case PlayheadCursorItem:
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
case ImageFrameHandleStartItem:
|
|
||||||
case ImageFrameHandleEndItem:
|
|
||||||
case MarkerViewHandleStartItem:
|
|
||||||
case MarkerViewHandleEndItem:
|
|
||||||
#endif
|
|
||||||
|
|
||||||
_over_region_trim_target = false;
|
_over_region_trim_target = false;
|
||||||
|
|
||||||
if (is_drawable()) {
|
if (is_drawable()) {
|
||||||
|
|
|
@ -302,14 +302,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
|
||||||
virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0;
|
virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0;
|
||||||
virtual void export_video () = 0;
|
virtual void export_video () = 0;
|
||||||
|
|
||||||
#ifdef WITH_CMT
|
|
||||||
virtual void connect_to_image_compositor() = 0;
|
|
||||||
virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0;
|
|
||||||
virtual void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) = 0;
|
|
||||||
virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0;
|
|
||||||
virtual TimeAxisView* get_named_time_axis(const std::string & name) = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
virtual RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0;
|
virtual RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0;
|
||||||
|
|
||||||
virtual void get_equivalent_regions (RegionView* rv, std::vector<RegionView*>&, PBD::PropertyID) const = 0;
|
virtual void get_equivalent_regions (RegionView* rv, std::vector<RegionView*>&, PBD::PropertyID) const = 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user