From 972a3e8476687951e8af4e9c1d4f25014dab1b82 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 27 Jul 2007 00:26:40 +0000 Subject: Use uint32_t for num_ports (and poly), matches LV2 and size_t is excessive on 64-bit. Remove (linear) sorted assertion from Table, except in unit tests. git-svn-id: http://svn.drobilla.net/lad/ingen@643 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/ControlPanel.cpp | 2 +- src/libs/gui/ControlPanel.hpp | 2 +- src/libs/gui/LoadPatchWindow.cpp | 2 +- src/libs/gui/LoadRemotePatchWindow.cpp | 2 +- src/libs/gui/LoadSubpatchWindow.cpp | 2 +- src/libs/gui/NewSubpatchWindow.cpp | 2 +- src/libs/gui/NodeControlWindow.cpp | 2 +- src/libs/gui/NodeControlWindow.hpp | 2 +- src/libs/gui/ThreadedLoader.cpp | 2 +- src/libs/gui/ThreadedLoader.hpp | 2 +- src/libs/gui/WindowFactory.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/libs/gui') diff --git a/src/libs/gui/ControlPanel.cpp b/src/libs/gui/ControlPanel.cpp index 0fb3dfb8..5a4fbb95 100644 --- a/src/libs/gui/ControlPanel.cpp +++ b/src/libs/gui/ControlPanel.cpp @@ -55,7 +55,7 @@ ControlPanel::~ControlPanel() void -ControlPanel::init(SharedPtr node, size_t poly) +ControlPanel::init(SharedPtr node, uint32_t poly) { assert(node != NULL); assert(poly > 0); diff --git a/src/libs/gui/ControlPanel.hpp b/src/libs/gui/ControlPanel.hpp index 70ae4e95..1c206c52 100644 --- a/src/libs/gui/ControlPanel.hpp +++ b/src/libs/gui/ControlPanel.hpp @@ -54,7 +54,7 @@ public: ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); virtual ~ControlPanel(); - void init(SharedPtr node, size_t poly); + void init(SharedPtr node, uint32_t poly); ControlGroup* find_port(const Path& path) const; diff --git a/src/libs/gui/LoadPatchWindow.cpp b/src/libs/gui/LoadPatchWindow.cpp index d849c256..da557b40 100644 --- a/src/libs/gui/LoadPatchWindow.cpp +++ b/src/libs/gui/LoadPatchWindow.cpp @@ -118,7 +118,7 @@ LoadPatchWindow::ok_clicked() { // If unset load_patch will load values optional name; - optional poly; + optional poly; optional parent; diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp index 77a03386..276a0485 100644 --- a/src/libs/gui/LoadRemotePatchWindow.cpp +++ b/src/libs/gui/LoadRemotePatchWindow.cpp @@ -136,7 +136,7 @@ LoadRemotePatchWindow::open_clicked() // If unset load_patch will load values optional name; - optional poly; + optional poly; optional parent; diff --git a/src/libs/gui/LoadSubpatchWindow.cpp b/src/libs/gui/LoadSubpatchWindow.cpp index a2591b86..d3628e64 100644 --- a/src/libs/gui/LoadSubpatchWindow.cpp +++ b/src/libs/gui/LoadSubpatchWindow.cpp @@ -144,7 +144,7 @@ LoadSubpatchWindow::ok_clicked() // If unset load_patch will load values optional name; - optional poly; + optional poly; string name_str = ""; if (_name_from_user_radio->get_active()) { diff --git a/src/libs/gui/NewSubpatchWindow.cpp b/src/libs/gui/NewSubpatchWindow.cpp index 8b66b6c2..103e9a54 100644 --- a/src/libs/gui/NewSubpatchWindow.cpp +++ b/src/libs/gui/NewSubpatchWindow.cpp @@ -88,7 +88,7 @@ void NewSubpatchWindow::ok_clicked() { const Path path = _patch->path().base() + Path::nameify(_name_entry->get_text()); - const size_t poly = _poly_spinbutton->get_value_as_int(); + const uint32_t poly = _poly_spinbutton->get_value_as_int(); App::instance().engine()->create_patch(path, poly); for (MetadataMap::const_iterator i = _initial_data.begin(); i != _initial_data.end(); ++i) diff --git a/src/libs/gui/NodeControlWindow.cpp b/src/libs/gui/NodeControlWindow.cpp index e5f25a1e..482f2c3b 100644 --- a/src/libs/gui/NodeControlWindow.cpp +++ b/src/libs/gui/NodeControlWindow.cpp @@ -34,7 +34,7 @@ namespace GUI { /** Create a node control window and load a new ControlPanel for it. */ -NodeControlWindow::NodeControlWindow(SharedPtr node, size_t poly) +NodeControlWindow::NodeControlWindow(SharedPtr node, uint32_t poly) : _node(node), _position_stored(false), _x(0), _y(0) diff --git a/src/libs/gui/NodeControlWindow.hpp b/src/libs/gui/NodeControlWindow.hpp index b639474a..a749fe86 100644 --- a/src/libs/gui/NodeControlWindow.hpp +++ b/src/libs/gui/NodeControlWindow.hpp @@ -45,7 +45,7 @@ class ControlPanel; class NodeControlWindow : public Gtk::Window { public: - NodeControlWindow(SharedPtr node, size_t poly); + NodeControlWindow(SharedPtr node, uint32_t poly); NodeControlWindow(SharedPtr node, ControlPanel* panel); virtual ~NodeControlWindow(); diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp index ecabe5e1..630303b6 100644 --- a/src/libs/gui/ThreadedLoader.cpp +++ b/src/libs/gui/ThreadedLoader.cpp @@ -79,7 +79,7 @@ ThreadedLoader::load_patch(bool merge, MetadataMap engine_data, optional engine_parent, optional engine_name, - optional engine_poly) + optional engine_poly) { _mutex.lock(); diff --git a/src/libs/gui/ThreadedLoader.hpp b/src/libs/gui/ThreadedLoader.hpp index a08ee158..e65470f7 100644 --- a/src/libs/gui/ThreadedLoader.hpp +++ b/src/libs/gui/ThreadedLoader.hpp @@ -67,7 +67,7 @@ public: MetadataMap engine_data, optional engine_parent, optional engine_name = optional(), - optional engine_poly = optional()); + optional engine_poly = optional()); void save_patch(SharedPtr model, const string& filename); diff --git a/src/libs/gui/WindowFactory.cpp b/src/libs/gui/WindowFactory.cpp index b1ebe5ae..1fff1535 100644 --- a/src/libs/gui/WindowFactory.cpp +++ b/src/libs/gui/WindowFactory.cpp @@ -214,7 +214,7 @@ WindowFactory::present_controls(SharedPtr node) NodeControlWindow* WindowFactory::new_control_window(SharedPtr node) { - size_t poly = 1; + uint32_t poly = 1; if (node->polyphonic()) poly = ((PatchModel*)node->parent().get())->poly(); -- cgit v1.2.1