13
0

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

git-svn-id: svn://localhost/trunk/ardour2@208 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Karsten Wiese 2005-12-24 13:07:36 +00:00
parent d7cd04b719
commit 796ded66a3
5 changed files with 9 additions and 9 deletions

View File

@ -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)
{

View File

@ -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);
}

View File

@ -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;

View File

@ -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)) ;

View File

@ -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