X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_socket_handler.h;h=5af182441786f1dba3102eb084b141fa91fe5448;hb=81ef56fba962ff7b16658cc2831720947aacc8b5;hp=cbf28e136cc0a7a821232571ec3fc62652fbd70b;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git diff --git a/gtk2_ardour/imageframe_socket_handler.h b/gtk2_ardour/imageframe_socket_handler.h index cbf28e136c..5af1824417 100644 --- a/gtk2_ardour/imageframe_socket_handler.h +++ b/gtk2_ardour/imageframe_socket_handler.h @@ -22,7 +22,6 @@ #define __ardour_gtk_imageframe_socket_handler_h__ #include -#include #include #include "editor.h" #include "ardour_image_compositor_socket.h" @@ -78,7 +77,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @return true if the connection was a succees * false otherwise */ - bool connect(std::string hostIp, int32_t port) ; + bool connect(const char * hostIp, int32_t port) ; /** * Closes the connection to th Image Compositor @@ -129,7 +128,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param track_id the unique id of the removed image frame time axis * @param src the identity of the object that initiated the change */ - void send_imageframe_time_axis_removed(std::string track_id, void* src) ; + void send_imageframe_time_axis_removed(const string & track_id, void* src) ; /** * Sends a message indicating that an ImageFrameTimeAxis has been renamed @@ -139,7 +138,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param time_axis the time axis that has changed */ - void send_imageframe_time_axis_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxis* time_axis) ; + void send_imageframe_time_axis_renamed(const string & new_id, const string & old_id, void* src, ImageFrameTimeAxis* time_axis) ; //------------------------ // MarkerTimeAxis Messages @@ -150,7 +149,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param track_id the unique id of the removed image frame time axis * @param src the identity of the object that initiated the change */ - void send_marker_time_axis_removed(std::string track_id, void* src) ; + void send_marker_time_axis_removed(const string & track_id, void* src) ; /** * Sends a message indicating that an MarkerTimeAxis has been renamed @@ -160,7 +159,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param time_axis the time axis that has changed */ - void send_marker_time_axis_renamed(std::string new_id, std::string old_id, void* src, MarkerTimeAxis* time_axis) ; + void send_marker_time_axis_renamed(const string & new_id, const string & old_id, void* src, MarkerTimeAxis* time_axis) ; //--------------------------------- @@ -173,7 +172,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param group the group that has changed */ - void send_imageframe_time_axis_group_removed(std::string group_id, void* src, ImageFrameTimeAxisGroup* group) ; + void send_imageframe_time_axis_group_removed(const string & group_id, void* src, ImageFrameTimeAxisGroup* group) ; /** * Send a message indicating that an ImageFrameTimeAxisGroup has been renamed @@ -183,7 +182,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param group the group that has changed */ - void send_imageframe_time_axis_group_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxisGroup* group) ; + void send_imageframe_time_axis_group_renamed(const string & new_id, const string & old_id, void* src, ImageFrameTimeAxisGroup* group) ; //--------------------------------- @@ -214,7 +213,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param item the renamed item */ - void send_imageframe_view_renamed(std::string new_id, std::string old_id, void* src, ImageFrameView* item) ; + void send_imageframe_view_renamed(const string & new_id, const string & old_id, void* src, ImageFrameView* item) ; /** * Send a message indicating that an ImageFrameView item has been removed message @@ -223,7 +222,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param item the removed item */ - void send_imageframe_view_removed(std::string item_id, void* src, ImageFrameView* item) ; + void send_imageframe_view_removed(const string & item_id, void* src, ImageFrameView* item) ; //--------------------------------- // MarkerView Messages @@ -254,7 +253,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param item the MarkerView which has been renamed */ - void send_marker_view_renamed(std::string new_id, std::string old_id, void* src, MarkerView* item) ; + void send_marker_view_renamed(const string & new_id, const string & old_id, void* src, MarkerView* item) ; /** * Send a message indicating that a MarkerView item has been removed message @@ -263,7 +262,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param src the identity of the object that initiated the change * @param item the MarkerView which has been removed */ - void send_marker_view_removed(std::string item_id, void* src, MarkerView* item) ; + void send_marker_view_removed(const string & item_id, void* src, MarkerView* item) ; //---------------------------------------------------------------------------------------// @@ -651,7 +650,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param errmsg populated with a description of the error on failure * @return the described item on success, 0 otherwise */ - ImageFrameView* get_imageframe_view_from_desc(const std::string& track_id, const std::string& group_ud, const std::string& item_id, int& errcode, std::string& errmsg) ; + ImageFrameView* get_imageframe_view_from_desc(const string & track_id, const string & group_ud, const string & item_id, int& errcode, std::string& errmsg) ; //---------------------------------------------------------------------------------------// // Convenince Message Send Methods @@ -662,7 +661,7 @@ class ImageFrameSocketHandler : public sigc::trackable * @param msg the message to send * @return the return value of the socket call */ - int send_message(const std::string& msg) ; + int send_message(const string & msg) ; /** * Reads a message from the Socket