X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_socket_handler.cc;h=dac36c6e2e3b5f7973643c6610974341309b7bfd;hb=f93ca1349ce3d56ecd9b90c1b6e88971d46d9952;hp=06faaa220e5d336ed6a9e47f1933d59caeb3d7b5;hpb=c38fdbc64c73c686f9f55729b352f8d0f4c09070;p=ardour.git diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc index 06faaa220e..dac36c6e2e 100644 --- a/gtk2_ardour/imageframe_socket_handler.cc +++ b/gtk2_ardour/imageframe_socket_handler.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -45,13 +44,15 @@ #include "i18n.h" #include +#include -#include #include using namespace std; using namespace ardourvis ; using namespace sigc; +using namespace ARDOUR; +using namespace PBD; ImageFrameSocketHandler* ImageFrameSocketHandler::_instance = 0 ; @@ -185,7 +186,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()) { @@ -205,7 +206,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)) ; @@ -294,7 +295,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) { @@ -329,7 +330,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)); @@ -371,7 +372,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) { @@ -406,7 +407,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)); @@ -449,7 +450,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) { @@ -489,7 +490,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)); @@ -537,7 +538,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(std::string new * @param item the time axis item whos position has changed */ void -ImageFrameSocketHandler::send_imageframe_view_position_change(jack_nframes_t pos, void* src, ImageFrameView* item) +ImageFrameSocketHandler::send_imageframe_view_position_change(nframes_t pos, void* src, ImageFrameView* item) { // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), pos, src, item)); @@ -573,7 +574,7 @@ ImageFrameSocketHandler::send_imageframe_view_position_change(jack_nframes_t pos * @param item the item which has had a duration change */ void -ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur, void* src, ImageFrameView* item) +ImageFrameSocketHandler::send_imageframe_view_duration_change(nframes_t dur, void* src, ImageFrameView* item) { // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), dur, src, item)); @@ -608,7 +609,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) { @@ -643,7 +644,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) { @@ -687,7 +688,7 @@ ImageFrameSocketHandler::send_imageframe_view_removed(std::string item_id, void* * @param item the time axis item whos position has changed */ void -ImageFrameSocketHandler::send_marker_view_position_change(jack_nframes_t pos, void* src, MarkerView* item) +ImageFrameSocketHandler::send_marker_view_position_change(nframes_t pos, void* src, MarkerView* item) { if(this == src || src == 0) { @@ -721,7 +722,7 @@ ImageFrameSocketHandler::send_marker_view_position_change(jack_nframes_t pos, vo * @param item the time axis item whos position has changed */ void -ImageFrameSocketHandler::send_marker_view_duration_change(jack_nframes_t dur, void* src, MarkerView* item) +ImageFrameSocketHandler::send_marker_view_duration_change(nframes_t dur, void* src, MarkerView* item) { if(this == src || src == 0) { @@ -756,7 +757,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) { @@ -792,7 +793,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) { @@ -1091,7 +1092,7 @@ ImageFrameSocketHandler::handle_item_selected(const char* msg) } else { - ifv->set_selected(true, this) ; + ifv->set_selected(true) ; ifta->get_view()->set_selected_imageframe_view(iftag, ifv) ; thePublicEditor.scroll_timeaxis_to_imageframe_item(ifv) ; @@ -1336,11 +1337,11 @@ ImageFrameSocketHandler::handle_insert_imageframe_view(const char* msg) position += image_id_size ; // get the start frame value - jack_nframes_t start = strtoul((get_message_part(position,10,msg).c_str()),0,10) ; + nframes_t start = strtoul((get_message_part(position,10,msg).c_str()),0,10) ; position += 10 ; // get the duration value - jack_nframes_t duration = strtoul((get_message_part(position,10,msg).c_str()),0,10) ; + nframes_t duration = strtoul((get_message_part(position,10,msg).c_str()),0,10) ; position += 10 ; //get the named time axis view we about to add an image to @@ -1672,7 +1673,7 @@ ImageFrameSocketHandler::handle_imageframe_view_position_update(const char* msg) this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ; - jack_nframes_t start_frame = strtoul(get_message_part(position, ardourvis::TIME_VALUE_CHARS, msg).c_str(), 0, 10) ; + nframes_t start_frame = strtoul(get_message_part(position, ardourvis::TIME_VALUE_CHARS, msg).c_str(), 0, 10) ; position += ardourvis::TIME_VALUE_CHARS ; // get the named time axis @@ -1724,7 +1725,7 @@ ImageFrameSocketHandler::handle_imageframe_view_duration_update(const char* msg) this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ; - jack_nframes_t duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; + nframes_t duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; position += ardourvis::TIME_VALUE_CHARS ; // get the named time axis @@ -1827,7 +1828,7 @@ ImageFrameSocketHandler::handle_imageframe_view_max_duration_update(const char* this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ; - jack_nframes_t max_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; + nframes_t max_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; position += ardourvis::TIME_VALUE_CHARS ; int errcode ; @@ -1915,7 +1916,7 @@ ImageFrameSocketHandler::handle_imageframe_view_min_duration_update(const char* this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ; - jack_nframes_t min_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; + nframes_t min_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ; position += ardourvis::TIME_VALUE_CHARS ; int errcode ; @@ -2062,7 +2063,7 @@ ImageFrameSocketHandler::handle_open_session(const char* msg) std::string path, name ; bool isnew; - if (ARDOUR::Session::find_session(session_name, path, name, isnew) == 0) { + if (ARDOUR::find_session(session_name, path, name, isnew) == 0) { if (ARDOUR_UI::instance()->load_session (path, name) == 0) { send_return_success() ; } else { @@ -2239,7 +2240,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 ; @@ -2294,7 +2295,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) ;