projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...
[ardour.git]
/
gtk2_ardour
/
imageframe_socket_handler.cc
diff --git
a/gtk2_ardour/imageframe_socket_handler.cc
b/gtk2_ardour/imageframe_socket_handler.cc
index d6008a963776681696779b0c3ff0aa13b361a64c..2838be6f667295fe8885b48e3d0e9576a94c4683 100644
(file)
--- 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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <iostream>
*/
#include <iostream>
@@
-44,13
+43,16
@@
#include "i18n.h"
#include "i18n.h"
-#include <ardour/session.h>
+#include "ardour/session.h"
+#include "ardour/session_utils.h"
#include <unistd.h>
using namespace std;
using namespace ardourvis ;
using namespace sigc;
#include <unistd.h>
using namespace std;
using namespace ardourvis ;
using namespace sigc;
+using namespace ARDOUR;
+using namespace PBD;
ImageFrameSocketHandler* ImageFrameSocketHandler::_instance = 0 ;
ImageFrameSocketHandler* ImageFrameSocketHandler::_instance = 0 ;
@@
-184,7
+186,7
@@
ImageFrameSocketHandler::image_socket_callback(void *arg, int32_t fd, GdkInputCo
* false otherwise
*/
bool
* false otherwise
*/
bool
-ImageFrameSocketHandler::connect(
std::string
hostIp, int32_t port)
+ImageFrameSocketHandler::connect(
const char *
hostIp, int32_t port)
{
if (is_connected())
{
{
if (is_connected())
{
@@
-204,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) ;
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)) ;
int status = ::connect(theArdourToCompositorSocket, (sockaddr *) &m_addr, sizeof(m_addr)) ;
@@
-293,7
+295,7
@@
ImageFrameSocketHandler::get_socket_descriptor()
* @param src the identity of the object that initiated the change
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-328,7
+330,7
@@
ImageFrameSocketHandler::send_imageframe_time_axis_removed(std::string track_id,
* @param time_axis the time axis that has changed
*/
void
* @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));
{
// ENSURE_GUI_THREAD(SigC::bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), new_id, old_id, src, time_axis));
@@
-370,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
* @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)
{
{
if(this == src || src == 0)
{
@@
-405,7
+407,7
@@
ImageFrameSocketHandler::send_marker_time_axis_removed(std::string track_id, voi
* @param time_axis the time axis that has changed
*/
void
* @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));
{
// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), new_id, old_id, src, time_axis));
@@
-448,7
+450,7
@@
ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std::
* @param group the group that has changed
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-488,7
+490,7
@@
ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(std::string gro
* @param group the group that has changed
*/
void
* @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));
{
// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), new_id, old_id, src, group));
@@
-536,7
+538,7
@@
ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(std::string new
* @param item the time axis item whos position has changed
*/
void
* @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));
{
// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), pos, src, item));
@@
-572,7
+574,7
@@
ImageFrameSocketHandler::send_imageframe_view_position_change(jack_nframes_t pos
* @param item the item which has had a duration change
*/
void
* @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));
{
// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), dur, src, item));
@@
-607,7
+609,7
@@
ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur
* @param item the renamed item
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-642,7
+644,7
@@
ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::s
* @param item the removed item
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-686,7
+688,7
@@
ImageFrameSocketHandler::send_imageframe_view_removed(std::string item_id, void*
* @param item the time axis item whos position has changed
*/
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)
{
{
if(this == src || src == 0)
{
@@
-720,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
* @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)
{
{
if(this == src || src == 0)
{
@@
-755,7
+757,7
@@
ImageFrameSocketHandler::send_marker_view_duration_change(jack_nframes_t dur, vo
* @param item the MarkerView which has been renamed
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-791,7
+793,7
@@
ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::strin
* @param item the MarkerView which has been removed
*/
void
* @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)
{
{
if(this == src || src == 0)
{
@@
-1090,7
+1092,7
@@
ImageFrameSocketHandler::handle_item_selected(const char* msg)
}
else
{
}
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) ;
ifta->get_view()->set_selected_imageframe_view(iftag, ifv) ;
thePublicEditor.scroll_timeaxis_to_imageframe_item(ifv) ;
@@
-1335,11
+1337,11
@@
ImageFrameSocketHandler::handle_insert_imageframe_view(const char* msg)
position += image_id_size ;
// get the start frame value
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
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
position += 10 ;
//get the named time axis view we about to add an image to
@@
-1671,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) ;
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
position += ardourvis::TIME_VALUE_CHARS ;
// get the named time axis
@@
-1723,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) ;
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
position += ardourvis::TIME_VALUE_CHARS ;
// get the named time axis
@@
-1826,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) ;
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 ;
position += ardourvis::TIME_VALUE_CHARS ;
int errcode ;
@@
-1914,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) ;
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 ;
position += ardourvis::TIME_VALUE_CHARS ;
int errcode ;
@@
-2061,7
+2063,7
@@
ImageFrameSocketHandler::handle_open_session(const char* msg)
std::string path, name ;
bool isnew;
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 {
if (ARDOUR_UI::instance()->load_session (path, name) == 0) {
send_return_success() ;
} else {
@@
-2238,7
+2240,7
@@
ImageFrameSocketHandler::compose_marker_item_desc(MarkerView* mv, std::ostringst
* @return the described item on success, 0 otherwise
*/
ImageFrameView*
* @return the described item on success, 0 otherwise
*/
ImageFrameView*
-ImageFrameSocketHandler::get_imageframe_view_from_desc(const st
d::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 st
ring & track_id, const string & group_id, const string
& item_id, int& errcode, std::string& errmsg)
{
ImageFrameView* item = 0 ;
{
ImageFrameView* item = 0 ;
@@
-2293,7
+2295,7
@@
ImageFrameSocketHandler::get_imageframe_view_from_desc(const std::string& track_
* @return the return value of the socket call
*/
int
* @return the return value of the socket call
*/
int
-ImageFrameSocketHandler::send_message(const st
d::string
& msg)
+ImageFrameSocketHandler::send_message(const st
ring
& msg)
{
//std::cout << "Sending Message [" << msg << "]\n" ;
int retcode = ::send(theArdourToCompositorSocket, msg.c_str(), msg.length(), MSG_NOSIGNAL) ;
{
//std::cout << "Sending Message [" << msg << "]\n" ;
int retcode = ::send(theArdourToCompositorSocket, msg.c_str(), msg.length(), MSG_NOSIGNAL) ;