some more "std::string" to "const char *" conversations.

git-svn-id: svn://localhost/trunk/ardour2@208 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index e922a1e353175b86a2651ca67a913e1c2ed9430f..798a5c2950ea66e5299e342bddd14c662fd28db8 100644 (file)
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -75,9 +75,9 @@ Editor::connect_to_image_compositor()
        }
 
        // XXX should really put this somewhere safe
-       std::string host_ip = "127.0.0.1" ;
+       const char * host_ip = "127.0.0.1" ;
        
-       bool retcode = image_socket_listener->connect(host_ip,ardourvis::DEFAULT_PORT) ;
+       bool retcode = image_socket_listener->connect(host_ip, ardourvis::DEFAULT_PORT) ;
        
        if(retcode == false)
        {

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 5009da522ec7d8bbe5cc413e63924df00377653b..4368bf809ffb73a600828b0ed59fe9da3c23f7c0 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -548,13 +548,13 @@ GainMeter::gain_changed (void *src)
 }
 
 void
-GainMeter::set_meter_strip_name (string name)
+GainMeter::set_meter_strip_name (const char * name)
 {
        meter_metric_area.set_name (name);
 }
 
 void
-GainMeter::set_fader_name (string name)
+GainMeter::set_fader_name (const char * name)
 {
        gain_slider->set_name (name);
 }

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 6a7b88e1c4092c153dfed3ff6e7cf1c089af3ed6..597cb06cb387753f7d12a921e0e3aa8fdbb24cd0 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -70,8 +70,8 @@ class GainMeter : public Gtk::VBox
        void set_width (Width);
        void setup_meters ();
 
-       void set_meter_strip_name (string name);
-       void set_fader_name (string name);
+       void set_meter_strip_name (const char * name);
+       void set_fader_name (const char * name);
 
   private:
        ARDOUR::IO& _io;

diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc
index dc3faa9c4a068f5b863a76f81eaa7a3f05d94a5b..4f08954a8d5bb5da4c9d1ad02a0a0510f4b781a1 100644 (file)
--- a/gtk2_ardour/imageframe_socket_handler.cc
+++ b/gtk2_ardour/imageframe_socket_handler.cc
@@ -185,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())
        {
@@ -205,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)) ;
        

diff --git a/gtk2_ardour/imageframe_socket_handler.h b/gtk2_ardour/imageframe_socket_handler.h
index b69a26b5d10fefb4c955ca15cb43fbd28c00e8da..5af182441786f1dba3102eb084b141fa91fe5448 100644 (file)
--- a/gtk2_ardour/imageframe_socket_handler.h
+++ b/gtk2_ardour/imageframe_socket_handler.h
@@ -77,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