Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

[ardour.git] / libs / ardour / ardour / bundle.h

diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index 369b12ec9ba68c02581026cfa2690df9769efc34..46b07c48f5b38ca20aa323d1a326fc5959ad58ff 100644 (file)
--- a/libs/ardour/ardour/bundle.h
+++ b/libs/ardour/ardour/bundle.h
@@ -100,6 +100,8 @@ class Bundle : public PBD::ScopedConnectionList
        void disconnect (boost::shared_ptr<Bundle>, AudioEngine &);
        bool connected_to (boost::shared_ptr<Bundle>, AudioEngine &);
        bool has_same_ports (boost::shared_ptr<Bundle>) const;
+       uint32_t type_channel_to_overall (DataType, uint32_t) const;
+       uint32_t overall_channel_to_type (DataType, uint32_t) const;
 
        void set_name (std::string const &);
 
@@ -114,6 +116,8 @@ class Bundle : public PBD::ScopedConnectionList
        void suspend_signals ();
        void resume_signals ();
 
+       bool operator== (Bundle const & other);
+
        /** Things that might change about this bundle */
        enum Change {
                NameChanged = 0x1, ///< the bundle name or a channel name has changed
@@ -144,8 +148,6 @@ class Bundle : public PBD::ScopedConnectionList
        Change _pending_change;
 };
 
-
-
 struct BundleChannel
 {
        BundleChannel () : channel (-1) {}
@@ -167,4 +169,6 @@ struct BundleChannel
 
 }
 
+std::ostream & operator<< (std::ostream & o, ARDOUR::Bundle const &);
+
 #endif /* __ardour_bundle_h__ */