Stop publishing mini_timeline from ardour_ui.h, and fix the fallout
This commit is contained in:
parent
057ddabada
commit
e36a6f5180
@ -26,6 +26,8 @@
|
|||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include <sigc++/bind.h>
|
#include <sigc++/bind.h>
|
||||||
|
|
||||||
|
#include <gtkmm/alignment.h>
|
||||||
#include <gtkmm/stock.h>
|
#include <gtkmm/stock.h>
|
||||||
#include <gtkmm/messagedialog.h>
|
#include <gtkmm/messagedialog.h>
|
||||||
#include <gtkmm/separator.h>
|
#include <gtkmm/separator.h>
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <sigc++/bind.h>
|
#include <sigc++/bind.h>
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
|
|
||||||
|
#include <gtkmm/alignment.h>
|
||||||
#include <gtkmm/box.h>
|
#include <gtkmm/box.h>
|
||||||
#include <gtkmm/filechooserdialog.h>
|
#include <gtkmm/filechooserdialog.h>
|
||||||
#include <gtkmm/scrolledwindow.h>
|
#include <gtkmm/scrolledwindow.h>
|
||||||
|
@ -180,7 +180,6 @@
|
|||||||
#include "splash.h"
|
#include "splash.h"
|
||||||
#include "template_dialog.h"
|
#include "template_dialog.h"
|
||||||
#include "time_axis_view_item.h"
|
#include "time_axis_view_item.h"
|
||||||
#include "time_info_box.h"
|
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
#include "application_bar.h" //TODO: remove this and put in Rec/Edit/Mix/Cue
|
#include "application_bar.h" //TODO: remove this and put in Rec/Edit/Mix/Cue
|
||||||
#include "transport_masters_dialog.h"
|
#include "transport_masters_dialog.h"
|
||||||
|
@ -89,7 +89,6 @@
|
|||||||
#include "ardour_window.h"
|
#include "ardour_window.h"
|
||||||
#include "editing.h"
|
#include "editing.h"
|
||||||
#include "enums.h"
|
#include "enums.h"
|
||||||
#include "mini_timeline.h"
|
|
||||||
#include "shuttle_control.h"
|
#include "shuttle_control.h"
|
||||||
#include "startup_fsm.h"
|
#include "startup_fsm.h"
|
||||||
#include "transport_control.h"
|
#include "transport_control.h"
|
||||||
|
@ -68,7 +68,6 @@
|
|||||||
#include "application_bar.h" //TODO: move to each window
|
#include "application_bar.h" //TODO: move to each window
|
||||||
#include "trigger_page.h"
|
#include "trigger_page.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "time_info_box.h"
|
|
||||||
#include "midi_tracer.h"
|
#include "midi_tracer.h"
|
||||||
#include "global_port_matrix.h"
|
#include "global_port_matrix.h"
|
||||||
#include "location_ui.h"
|
#include "location_ui.h"
|
||||||
|
@ -54,7 +54,6 @@
|
|||||||
#include "keyeditor.h"
|
#include "keyeditor.h"
|
||||||
#include "rc_option_editor.h"
|
#include "rc_option_editor.h"
|
||||||
#include "route_params_ui.h"
|
#include "route_params_ui.h"
|
||||||
#include "time_info_box.h"
|
|
||||||
#include "trigger_ui.h"
|
#include "trigger_ui.h"
|
||||||
#include "step_entry.h"
|
#include "step_entry.h"
|
||||||
#include "opts.h"
|
#include "opts.h"
|
||||||
|
@ -70,7 +70,6 @@
|
|||||||
#include "meter_patterns.h"
|
#include "meter_patterns.h"
|
||||||
#include "monitor_section.h"
|
#include "monitor_section.h"
|
||||||
#include "midi_tracer.h"
|
#include "midi_tracer.h"
|
||||||
#include "mini_timeline.h"
|
|
||||||
#include "mixer_ui.h"
|
#include "mixer_ui.h"
|
||||||
#include "plugin_dspload_window.h"
|
#include "plugin_dspload_window.h"
|
||||||
#include "plugin_manager_ui.h"
|
#include "plugin_manager_ui.h"
|
||||||
@ -84,7 +83,6 @@
|
|||||||
#include "speaker_dialog.h"
|
#include "speaker_dialog.h"
|
||||||
#include "splash.h"
|
#include "splash.h"
|
||||||
#include "sfdb_ui.h"
|
#include "sfdb_ui.h"
|
||||||
#include "time_info_box.h"
|
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
#include "application_bar.h" //TODO: remove
|
#include "application_bar.h" //TODO: remove
|
||||||
#include "transport_masters_dialog.h"
|
#include "transport_masters_dialog.h"
|
||||||
|
@ -42,6 +42,8 @@
|
|||||||
#include "public_editor.h"
|
#include "public_editor.h"
|
||||||
#include "virtual_keyboard_window.h"
|
#include "virtual_keyboard_window.h"
|
||||||
|
|
||||||
|
#include "gtkmm2ext/utils.h"
|
||||||
|
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
using namespace PBD;
|
using namespace PBD;
|
||||||
using namespace Gtkmm2ext;
|
using namespace Gtkmm2ext;
|
||||||
|
@ -47,6 +47,7 @@
|
|||||||
|
|
||||||
#include "gtkmm2ext/application.h"
|
#include "gtkmm2ext/application.h"
|
||||||
#include "gtkmm2ext/doi.h"
|
#include "gtkmm2ext/doi.h"
|
||||||
|
#include "gtkmm2ext/utils.h"
|
||||||
|
|
||||||
#include "widgets/prompter.h"
|
#include "widgets/prompter.h"
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <gtkmm/alignment.h>
|
||||||
#include <gtkmm/frame.h>
|
#include <gtkmm/frame.h>
|
||||||
|
|
||||||
#include "gtkmm2ext/utils.h"
|
#include "gtkmm2ext/utils.h"
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
#include "actions.h"
|
#include "actions.h"
|
||||||
#include "ardour_dialog.h"
|
#include "ardour_dialog.h"
|
||||||
#include "ardour_ui.h"
|
#include "ardour_ui.h"
|
||||||
|
#include "audio_clock.h"
|
||||||
#include "gui_thread.h"
|
#include "gui_thread.h"
|
||||||
#include "instrument_selector.h"
|
#include "instrument_selector.h"
|
||||||
#include "public_editor.h"
|
#include "public_editor.h"
|
||||||
@ -1838,7 +1839,7 @@ RecorderUI::RecRuler::render (Cairo::RefPtr<Cairo::Context> const& cr, cairo_rec
|
|||||||
|
|
||||||
char buf[32];
|
char buf[32];
|
||||||
int lw, lh;
|
int lw, lh;
|
||||||
AudioClock::print_minsec (when, buf, sizeof (buf), _session->sample_rate (), 0);
|
AudioClock::AudioClock::print_minsec (when, buf, sizeof (buf), _session->sample_rate (), 0);
|
||||||
_layout->set_text (string(buf).substr(1));
|
_layout->set_text (string(buf).substr(1));
|
||||||
_layout->get_pixel_size (lw, lh);
|
_layout->get_pixel_size (lw, lh);
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
#include "ardour/triggerbox.h"
|
#include "ardour/triggerbox.h"
|
||||||
|
|
||||||
#include "gtkmm2ext/colors.h"
|
#include "gtkmm2ext/colors.h"
|
||||||
|
#include <gtkmm2ext/utils.h>
|
||||||
|
|
||||||
#include "slot_properties_box.h"
|
#include "slot_properties_box.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user