diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 01:49:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 01:49:57 +0000 |
| commit | adeef356b239a25804c182b25e815f50f9d8fbab (patch) | |
| tree | 0e5fabb306f130f4cb0d153d13280cb635f85a81 /gtk2_ardour/imageframe_time_axis_group.h | |
| parent | 8aa1dfca0527f788404ab9807b9b35cda7e34061 (diff) | |
add processor-same-as-route-name fix, modified from 2.X version; clean up CMT stuff so that it will compile, but continue to not compile it
git-svn-id: svn://localhost/ardour2/branches/3.0@5714 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/imageframe_time_axis_group.h')
| -rw-r--r-- | gtk2_ardour/imageframe_time_axis_group.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h index 147e6b5295..e189b71e0b 100644 --- a/gtk2_ardour/imageframe_time_axis_group.h +++ b/gtk2_ardour/imageframe_time_axis_group.h @@ -53,7 +53,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param iftav the parent ImageFrameTimeAxis of this view helper * @param group_id the unique name/id of this group */ - ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const string & group_id) ; + ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const std::string & group_id) ; /** * Destructor @@ -72,7 +72,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param new_name the new name of this group * @param src the identity of the object that initiated the change */ - void set_group_name(const string & new_name, void* src) ; + void set_group_name(const std::string & new_name, void* src) ; /** * Returns the id of this group @@ -138,7 +138,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param num_channels the number of channles within the rgb_data * @param src the identity of the object that initiated the change */ - ImageFrameView* add_imageframe_item(const string & item_id, nframes_t start, nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ; + ImageFrameView* add_imageframe_item(const std::string & item_id, nframes_t start, nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ; /** * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper @@ -146,7 +146,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param item_id the unique id of the item to search for * @return the named ImageFrameView, or 0 if it is not held upon this view */ - ImageFrameView* get_named_imageframe_item(const string & item_id) ; + ImageFrameView* get_named_imageframe_item(const std::string & item_id) ; /** * Removes the currently selected ImageFrameView @@ -163,7 +163,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param src the identity of the object that initiated the change * @see add_imageframe_view */ - ImageFrameView* remove_named_imageframe_item(const string & item_id, void* src) ; + ImageFrameView* remove_named_imageframe_item(const std::string & item_id, void* src) ; /** * Removes ifv from the list of ImageFrameViews upon this TimeAxis. @@ -253,7 +253,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable sigc::signal<void, ImageFrameView*, void*> ImageFrameAdded ; /** Emitted when an ImageFrameView is removed from this group */ - sigc::signal<void, const string &, const string &, const string &, void*> ImageFrameRemoved ; + sigc::signal<void, const std::string &, const std::string &, const std::string &, void*> ImageFrameRemoved ; protected: |