X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_socket_handler.cc;h=4f08954a8d5bb5da4c9d1ad02a0a0510f4b781a1;hb=ce6c41c060c700489a9ac9fc5080bf2920c17ae2;hp=2bc275bf5ebb4b17dd6fc320e175bc79d8db1743;hpb=d38e2213d79b1c8952c776a3b60f7709457edc0c;p=ardour.git diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc index 2bc275bf5e..4f08954a8d 100644 --- a/gtk2_ardour/imageframe_socket_handler.cc +++ b/gtk2_ardour/imageframe_socket_handler.cc @@ -40,19 +40,18 @@ #include "marker_time_axis_view.h" #include "ardour_ui.h" #include "public_editor.h" -#include "extra_bind.h" #include "gui_thread.h" #include "i18n.h" #include -#include #include using namespace std; using namespace ardourvis ; using namespace sigc; +using namespace ARDOUR; ImageFrameSocketHandler* ImageFrameSocketHandler::_instance = 0 ; @@ -186,7 +185,7 @@ ImageFrameSocketHandler::image_socket_callback(void *arg, int32_t fd, GdkInputCo * false otherwise */ bool -ImageFrameSocketHandler::connect(std::string hostIp, int32_t port) +ImageFrameSocketHandler::connect(const char * hostIp, int32_t port) { if (is_connected()) { @@ -206,7 +205,7 @@ ImageFrameSocketHandler::connect(std::string hostIp, int32_t port) sockaddr_in m_addr ; m_addr.sin_family = AF_INET ; m_addr.sin_port = htons(port) ; - m_addr.sin_addr.s_addr = inet_addr(hostIp.c_str()) ; + m_addr.sin_addr.s_addr = inet_addr(hostIp) ; int status = ::connect(theArdourToCompositorSocket, (sockaddr *) &m_addr, sizeof(m_addr)) ; @@ -295,7 +294,7 @@ ImageFrameSocketHandler::get_socket_descriptor() * @param src the identity of the object that initiated the change */ void -ImageFrameSocketHandler::send_imageframe_time_axis_removed(std::string track_id, void* src) +ImageFrameSocketHandler::send_imageframe_time_axis_removed(const string & track_id, void* src) { if(this == src || src == 0) { @@ -330,7 +329,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_removed(std::string track_id, * @param time_axis the time axis that has changed */ void -ImageFrameSocketHandler::send_imageframe_time_axis_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxis* time_axis) +ImageFrameSocketHandler::send_imageframe_time_axis_renamed(const string & new_id, const string & old_id, void* src, ImageFrameTimeAxis* time_axis) { // ENSURE_GUI_THREAD(SigC::bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), new_id, old_id, src, time_axis)); @@ -372,7 +371,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_renamed(std::string new_id, s * @param src the identity of the object that initiated the change */ void -ImageFrameSocketHandler::send_marker_time_axis_removed(std::string track_id, void* src) +ImageFrameSocketHandler::send_marker_time_axis_removed(const string & track_id, void* src) { if(this == src || src == 0) { @@ -407,7 +406,7 @@ ImageFrameSocketHandler::send_marker_time_axis_removed(std::string track_id, voi * @param time_axis the time axis that has changed */ void -ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std::string old_id, void* src, MarkerTimeAxis* time_axis) +ImageFrameSocketHandler::send_marker_time_axis_renamed(const string & new_id, const string & old_id, void* src, MarkerTimeAxis* time_axis) { // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), new_id, old_id, src, time_axis)); @@ -450,7 +449,7 @@ ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std:: * @param group the group that has changed */ void -ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(std::string group_id, void* src, ImageFrameTimeAxisGroup* group) +ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(const string & group_id, void* src, ImageFrameTimeAxisGroup* group) { if(this == src || src == 0) { @@ -490,7 +489,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(std::string gro * @param group the group that has changed */ void -ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxisGroup* group) +ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(const string & new_id, const string & old_id, void* src, ImageFrameTimeAxisGroup* group) { // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), new_id, old_id, src, group)); @@ -609,7 +608,7 @@ ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur * @param item the renamed item */ void -ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::string old_id, void* src, ImageFrameView* item) +ImageFrameSocketHandler::send_imageframe_view_renamed(const string & new_id, const string & old_id, void* src, ImageFrameView* item) { if(this == src || src == 0) { @@ -644,7 +643,7 @@ ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::s * @param item the removed item */ void -ImageFrameSocketHandler::send_imageframe_view_removed(std::string item_id, void* src, ImageFrameView* item) +ImageFrameSocketHandler::send_imageframe_view_removed(const string & item_id, void* src, ImageFrameView* item) { if(this == src || src == 0) { @@ -757,7 +756,7 @@ ImageFrameSocketHandler::send_marker_view_duration_change(jack_nframes_t dur, vo * @param item the MarkerView which has been renamed */ void -ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::string old_id, void* src, MarkerView* item) +ImageFrameSocketHandler::send_marker_view_renamed(const string & new_id, const string & old_id, void* src, MarkerView* item) { if(this == src || src == 0) { @@ -793,7 +792,7 @@ ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::strin * @param item the MarkerView which has been removed */ void -ImageFrameSocketHandler::send_marker_view_removed(std::string item_id, void* src, MarkerView* item) +ImageFrameSocketHandler::send_marker_view_removed(const string & item_id, void* src, MarkerView* item) { if(this == src || src == 0) { @@ -1165,7 +1164,7 @@ ImageFrameSocketHandler::handle_insert_imageframe_time_axis(const char* msg) { ImageFrameTimeAxis* ifta = (ImageFrameTimeAxis*)new_tav ; ifta->VisualTimeAxisRemoved.connect(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_removed)) ; - ifta->NameChanged.connect(SigC::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), ifta)) ; + ifta->NameChanged.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), ifta)) ; send_return_success() ; } @@ -2179,7 +2178,7 @@ ImageFrameSocketHandler::decompose_imageframe_item_desc(const char* msg, int& po * The description consists of the parent track name size and name, * the parent group name size and name, and the item name size and name * - * @param ifv the item to compose a description of + * @param ifv the item to string_compose a description of * @param buffer the buffer to write the description */ void @@ -2202,7 +2201,7 @@ ImageFrameSocketHandler::compose_imageframe_item_desc(ImageFrameView* ifv, std:: * The description consists of the parent track name size and name, * and the item name size and name * - * @param mv the item to compose a description of + * @param mv the item to string_compose a description of * @param buffer the buffer to write the description */ void @@ -2240,7 +2239,7 @@ ImageFrameSocketHandler::compose_marker_item_desc(MarkerView* mv, std::ostringst * @return the described item on success, 0 otherwise */ ImageFrameView* -ImageFrameSocketHandler::get_imageframe_view_from_desc(const std::string& track_id, const std::string& group_id, const std::string& item_id, int& errcode, std::string& errmsg) +ImageFrameSocketHandler::get_imageframe_view_from_desc(const string & track_id, const string & group_id, const string & item_id, int& errcode, std::string& errmsg) { ImageFrameView* item = 0 ; @@ -2295,7 +2294,7 @@ ImageFrameSocketHandler::get_imageframe_view_from_desc(const std::string& track_ * @return the return value of the socket call */ int -ImageFrameSocketHandler::send_message(const std::string& msg) +ImageFrameSocketHandler::send_message(const string & msg) { //std::cout << "Sending Message [" << msg << "]\n" ; int retcode = ::send(theArdourToCompositorSocket, msg.c_str(), msg.length(), MSG_NOSIGNAL) ; @@ -2326,7 +2325,7 @@ ImageFrameSocketHandler::read_message(std::string& msg) /** - * Convenience method to compose and send a success messasge back to the Image Compositor + * Convenience method to string_compose and send a success messasge back to the Image Compositor * */ void @@ -2336,7 +2335,7 @@ ImageFrameSocketHandler::send_return_success() } /** - * Convenience method to compose and send a failure messasge back to the Image Compositor + * Convenience method to string_compose and send a failure messasge back to the Image Compositor * * @param msg the failure message */