diff options
author | Robin Gareus <robin@gareus.org> | 2017-07-17 20:12:33 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
commit | beb73edf553dadbbef7a02727c04f51294b0f4e6 (patch) | |
tree | c706e536fb07e69bb2f050f9541784a41d65366c /gtk2_ardour | |
parent | 601c317d70a03190257577bd867cefc2c70d3275 (diff) |
Purify libcanvas, remove libardour dependency
A canvas is just a canvas. Move WaveView into its own library.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 21 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 20 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.h | 9 | ||||
-rw-r--r-- | gtk2_ardour/color_theme_manager.cc | 9 | ||||
-rw-r--r-- | gtk2_ardour/crossfade_edit.h | 5 | ||||
-rw-r--r-- | gtk2_ardour/ghostregion.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/ghostregion.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/tape_region_view.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/wscript | 3 |
11 files changed, 56 insertions, 45 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 0904e143c0..4a96798e70 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -36,7 +36,7 @@ export ARDOUR_DLL_PATH=$libs export GTK_PATH=~/.ardour3:$libs/clearlooks-newer export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH} -export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:$libs/libltc:$libs/canvas:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 638743897b..14a8695c8b 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -25,12 +25,11 @@ #include "pbd/stacktrace.h" #include "pbd/unwind.h" -#include <gtkmm2ext/utils.h> - #include "ardour/rc_configuration.h" #include "ardour/session.h" -#include "canvas/wave_view.h" +#include "gtkmm2ext/utils.h" +#include "waveview/wave_view.h" #include "audio_clock.h" #include "ardour_ui.h" @@ -476,7 +475,7 @@ ARDOUR_UI::parameter_changed (std::string p) Gtkmm2ext::disable_tooltips (); } } else if (p == "waveform-gradient-depth") { - ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); + ArdourWaveView::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "show-mini-timeline") { repack_transport_hbox (); } else if (p == "show-toolbar-recpunch") { @@ -490,17 +489,17 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-secondary-clock") { update_clock_visibility (); } else if (p == "waveform-scale") { - ArdourCanvas::WaveView::set_global_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); + ArdourWaveView::WaveView::set_global_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); } else if (p == "widget-prelight") { CairoWidget::set_widget_prelight (UIConfiguration::instance().get_widget_prelight()); } else if (p == "waveform-shape") { - ArdourCanvas::WaveView::set_global_shape (UIConfiguration::instance().get_waveform_shape() == Rectified - ? ArdourCanvas::WaveView::Rectified : ArdourCanvas::WaveView::Normal); + ArdourWaveView::WaveView::set_global_shape (UIConfiguration::instance().get_waveform_shape() == Rectified + ? ArdourWaveView::WaveView::Rectified : ArdourWaveView::WaveView::Normal); } else if (p == "show-waveform-clipping") { - ArdourCanvas::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); + ArdourWaveView::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); } else if (p == "waveform-cache-size") { /* GUI option has units of megabytes; image cache uses units of bytes */ - ArdourCanvas::WaveView::set_image_cache_size (UIConfiguration::instance().get_waveform_cache_size() * 1048576); + ArdourWaveView::WaveView::set_image_cache_size (UIConfiguration::instance().get_waveform_cache_size() * 1048576); } else if (p == "use-wm-visibility") { VisibilityTracker::set_use_window_manager_visibility (UIConfiguration::instance().get_use_wm_visibility()); } else if (p == "action-table-columns") { @@ -516,9 +515,9 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "layered-record-mode") { layered_button.set_active (_session->config.get_layered_record_mode ()); } else if (p == "show-waveform-clipping") { - ArdourCanvas::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); + ArdourWaveView::WaveView::set_global_show_waveform_clipping (UIConfiguration::instance().get_show_waveform_clipping()); } else if (p == "waveform-gradient-depth") { - ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); + ArdourWaveView::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "flat-buttons") { bool flat = UIConfiguration::instance().get_flat_buttons(); if (ArdourButton::flat_buttons () != flat) { diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index e81043588c..fd35f23645 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -48,6 +48,8 @@ #include "canvas/xfade_curve.h" #include "canvas/debug.h" +#include "waveview/debug.h" + #include "streamview.h" #include "audio_region_view.h" #include "audio_time_axis.h" @@ -427,7 +429,7 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { if ((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) { - for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { + for (vector<ArdourWaveView::WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { (*w)->region_resized (); } } @@ -1139,7 +1141,7 @@ AudioRegionView::delete_waves () } _data_ready_connections.clear (); - for (vector<WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { + for (vector<ArdourWaveView::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { group->remove(*w); } waves.clear(); @@ -1237,7 +1239,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) gdouble yoff = which * ht; - WaveView *wave = new WaveView (group, audio_region ()); + ArdourWaveView::WaveView *wave = new ArdourWaveView::WaveView (group, audio_region ()); CANVAS_DEBUG_NAME (wave, string_compose ("wave view for chn %1 of %2", which, get_item_name())); wave->set_channel (which); @@ -1252,15 +1254,15 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) switch (UIConfiguration::instance().get_waveform_shape()) { case Rectified: - wave->set_shape (WaveView::Rectified); + wave->set_shape (ArdourWaveView::WaveView::Rectified); break; default: - wave->set_shape (WaveView::Normal); + wave->set_shape (ArdourWaveView::WaveView::Normal); } wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); - vector<ArdourCanvas::WaveView*> v; + vector<ArdourWaveView::WaveView*> v; v.push_back (wave); set_some_waveform_colors (v); @@ -1426,7 +1428,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv) break; } - WaveView *wave = new WaveView (ghost->group, audio_region()); + ArdourWaveView::WaveView *wave = new ArdourWaveView::WaveView (ghost->group, audio_region()); CANVAS_DEBUG_NAME (wave, string_compose ("ghost wave for %1", get_item_name())); wave->set_channel (n); @@ -1546,7 +1548,7 @@ AudioRegionView::set_waveform_colors () } void -AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& waves_to_color) +AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& waves_to_color) { Gtkmm2ext::Color fill; Gtkmm2ext::Color outline; @@ -1578,7 +1580,7 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave } } - for (vector<ArdourCanvas::WaveView*>::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) { + for (vector<ArdourWaveView::WaveView*>::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) { (*w)->set_fill_color (fill); (*w)->set_outline_color (outline); (*w)->set_clip_color (clip); diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index cc0ab0500e..8841ee2e43 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -29,9 +29,10 @@ #include "ardour/audioregion.h" #include "canvas/fwd.h" -#include "canvas/wave_view.h" #include "canvas/xfade_curve.h" +#include "waveview/wave_view.h" + #include "region_view.h" #include "time_axis_view_item.h" #include "automation_line.h" @@ -151,8 +152,8 @@ protected: WaveformLogScaled = 0x10, }; - std::vector<ArdourCanvas::WaveView *> waves; - std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves() + std::vector<ArdourWaveView::WaveView *> waves; + std::vector<ArdourWaveView::WaveView *> tmp_waves; ///< see ::create_waves() std::list<std::pair<framepos_t, ArdourCanvas::Line*> > feature_lines; @@ -209,7 +210,7 @@ private: void parameter_changed (std::string const &); void setup_waveform_visibility (); - void set_some_waveform_colors (std::vector<ArdourCanvas::WaveView*>& waves_to_color); + void set_some_waveform_colors (std::vector<ArdourWaveView::WaveView*>& waves_to_color); /** A ScopedConnection for each PeaksReady callback (one per channel). Each member * may be 0 if no connection exists. diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index f43d8ff2de..c9ee7ac308 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/gtk2_ardour/color_theme_manager.cc @@ -26,9 +26,6 @@ #include "pbd/gstdio_compat.h" -#include "gtkmm2ext/cell_renderer_color_selector.h" -#include "gtkmm2ext/utils.h" - #include "pbd/compose.h" #include "pbd/file_utils.h" #include "pbd/replace_all.h" @@ -36,10 +33,14 @@ #include "ardour/filesystem_paths.h" #include "ardour/profile.h" +#include "gtkmm2ext/cell_renderer_color_selector.h" +#include "gtkmm2ext/utils.h" + #include "canvas/container.h" #include "canvas/rectangle.h" #include "canvas/scroll_group.h" -#include "canvas/wave_view.h" + +#include "waveview/wave_view.h" #include "ardour_dialog.h" #include "color_theme_manager.h" diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h index 911b9a7df6..f18b26ae8a 100644 --- a/gtk2_ardour/crossfade_edit.h +++ b/gtk2_ardour/crossfade_edit.h @@ -44,6 +44,9 @@ namespace ArdourCanvas { class Rectangle; class Line; class Polygon; +} + +namespace ArdourWaveview { class WaveView; } @@ -119,7 +122,7 @@ private: std::list<Point*> points; ARDOUR::AutomationList normative_curve; /* 0 - 1.0, linear */ ARDOUR::AutomationList gain_curve; /* 0 - 2.0, gain mapping */ - std::vector<ArdourCanvas::WaveView*> waves; + std::vector<ArdourWaveView::WaveView*> waves; Half(); }; diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index 799e53d3ca..b531bd9aa8 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -17,15 +17,17 @@ */ +#include "evoral/Note.hpp" + #include "ardour/parameter_descriptor.h" -#include "evoral/Note.hpp" #include "canvas/container.h" #include "canvas/polygon.h" #include "canvas/rectangle.h" -#include "canvas/wave_view.h" #include "canvas/debug.h" +#include "waveview/wave_view.h" + #include "automation_time_axis.h" #include "ghostregion.h" #include "midi_streamview.h" @@ -126,7 +128,7 @@ AudioGhostRegion::AudioGhostRegion(RegionView& rv, void AudioGhostRegion::set_samples_per_pixel (double fpp) { - for (vector<WaveView*>::iterator i = waves.begin(); i != waves.end(); ++i) { + for (vector<ArdourWaveView::WaveView*>::iterator i = waves.begin(); i != waves.end(); ++i) { (*i)->set_samples_per_pixel (fpp); } } @@ -134,7 +136,7 @@ AudioGhostRegion::set_samples_per_pixel (double fpp) void AudioGhostRegion::set_height () { - vector<WaveView*>::iterator i; + vector<ArdourWaveView::WaveView*>::iterator i; uint32_t n; GhostRegion::set_height(); diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index 7192538394..d8cff83143 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -24,7 +24,7 @@ #include <boost/unordered_map.hpp> #include "pbd/signals.h" -namespace ArdourCanvas { +namespace ArdourWaveView { class WaveView; } @@ -76,7 +76,7 @@ public: void set_height(); void set_colors(); - std::vector<ArdourCanvas::WaveView*> waves; + std::vector<ArdourWaveView::WaveView*> waves; }; class MidiGhostRegion : public GhostRegion { diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index b69cddf89e..91ceba039e 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -51,7 +51,7 @@ #include "ardour/plugin_manager.h" #include "control_protocol/control_protocol.h" -#include "canvas/wave_view.h" +#include "waveview/wave_view.h" #include "widgets/paths_dialog.h" #include "widgets/tooltips.h" @@ -1198,7 +1198,7 @@ private: { UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value()); /* XXX: should be triggered from the parameter changed signal */ - ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value()); + ArdourWaveView::WaveView::set_clip_level (_clip_level_adjustment.get_value()); } Adjustment _clip_level_adjustment; diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 284ba62eab..1e3c31f565 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -91,10 +91,10 @@ TapeAudioRegionView::update (uint32_t /*n*/) #if 0 /* deadlock: -#1 0x00007f9570ebd77c in g_mutex_lock_slowpath (mutex=0x7f9575157760 <ArdourCanvas::WaveView::current_image_lock>) at ././glib/gthread-posix.c:1313 +#1 0x00007f9570ebd77c in g_mutex_lock_slowpath (mutex=0x7f9575157760 <ArdourWaveView::WaveView::current_image_lock>) at ././glib/gthread-posix.c:1313 #2 0x000055f6f8d1aac0 in Glib::Threads::Mutex::Lock::Lock(Glib::Threads::Mutex&) (this=0x7ffc4d905aa0, mutex=...) at /usr/include/glibmm-2.4/glibmm/threads.h:688 -#3 0x00007f9574f05054 in ArdourCanvas::WaveView::invalidate_image_cache() (this=0x55f6fdf341a0) at ../libs/canvas/wave_view.cc:275 -#4 0x00007f9574f0b1b0 in ArdourCanvas::WaveView::gain_changed() (this=0x55f6fdf341a0) at ../libs/canvas/wave_view.cc:1329 +#3 0x00007f9574f05054 in ArdourWaveView::WaveView::invalidate_image_cache() (this=0x55f6fdf341a0) at ../libs/canvas/wave_view.cc:275 +#4 0x00007f9574f0b1b0 in ArdourWaveView::WaveView::gain_changed() (this=0x55f6fdf341a0) at ../libs/canvas/wave_view.cc:1329 #5 0x000055f6f96eb1b8 in TapeAudioRegionView::update(unsigned int) (this=0x55f6fdf32640) at ../gtk2_ardour/tape_region_view.cc:102 #6 0x000055f6f96eba9f in boost::_mfi::mf1<void, TapeAudioRegionView, unsigned int>::operator()(TapeAudioRegionView*, unsigned int) const (this=0x55f6fa74ce10, p=0x55f6fdf32640, a1=0) at /usr/include/boost/bind/mem_fn_template.hpp:165 @@ -125,12 +125,12 @@ TapeAudioRegionView::update (uint32_t /*n*/) #25 0x00007f957394eb15 in ARDOUR::AudioSource::read_peaks(ARDOUR::PeakData*, long, long, long, double) const (this=0x55f6fd359140, peaks=0x55f700da6b80, npeaks=1356, start=113190, cnt=447480, samples_per_visual_peak=330) at ../libs/ardour/audiosource.cc:337 #26 0x00007f957393a905 in ARDOUR::AudioRegion::read_peaks(ARDOUR::PeakData*, long, long, long, unsigned int, double) const (this= 0x55f6fd84c3b0, buf=0x55f700da6b80, npeaks=1356, offset=113190, cnt=447480, chan_n=0, frames_per_pixel=330) at ../libs/ardour/audioregion.cc:431 -#27 0x00007f9574f09caa in ArdourCanvas::WaveView::generate_image(boost::shared_ptr<ArdourCanvas::WaveViewThreadRequest>, bool) const (this=0x55f6fdf341a0, req=..., in_render_thread=false) +#27 0x00007f9574f09caa in ArdourWaveView::WaveView::generate_image(boost::shared_ptr<ArdourWaveView::WaveViewThreadRequest>, bool) const (this=0x55f6fdf341a0, req=..., in_render_thread=false) at ../libs/canvas/wave_view.cc:1005 -#28 0x00007f9574f08e99 in ArdourCanvas::WaveView::get_image(long, long, bool&) const (this=0x55f6fdf341a0, start=225060, end=448800, full_image=@0x7ffc4d9070c7: false) +#28 0x00007f9574f08e99 in ArdourWaveView::WaveView::get_image(long, long, bool&) const (this=0x55f6fdf341a0, start=225060, end=448800, full_image=@0x7ffc4d9070c7: false) ---Type <return> to continue, or q <return> to quit--- at ../libs/canvas/wave_view.cc:870 -#29 0x00007f9574f0a6e8 in ArdourCanvas::WaveView::render(ArdourCanvas::Rect const&, Cairo::RefPtr<Cairo::Context>) const (this=0x55f6fdf341a0, area=..., context=...) +#29 0x00007f9574f0a6e8 in ArdourWaveView::WaveView::render(ArdourCanvas::Rect const&, Cairo::RefPtr<Cairo::Context>) const (this=0x55f6fdf341a0, area=..., context=...) at ../libs/canvas/wave_view.cc:1180 */ @@ -145,7 +145,7 @@ TapeAudioRegionView::update (uint32_t /*n*/) /* this is a quick hack to draw something (abuse gain_changed to force * an image-cache invalidation. * - * TODO: ArdourCanvas::WaveView needs an API to look up the specific channel "n" + * TODO: ArdourWaveView::WaveView needs an API to look up the specific channel "n" * and a special case to not only invalidate the cache but re-expose the * waveform. e.g. * diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 6b0b4037c4..7df4ba2721 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -481,6 +481,7 @@ def build(bld): 'libmidipp', 'libgtkmm2ext', 'libcanvas', + 'libwaveview', 'libwidgets', 'libptformat', ] @@ -553,6 +554,7 @@ def build(bld): 'libgtk2_ardour', 'libgtkmm2ext', 'libcanvas', + 'libwaveview', 'libwidgets', 'libptformat', ] @@ -599,6 +601,7 @@ def build(bld): 'libmidipp', 'libgtkmm2ext', 'libcanvas', + 'libwaveview', 'libwidgets', 'libptformat', ] |