Browse Source

Mixer: Fix OSC pathname generation when running without NSM.

tags/non-daw-v1.2.0
Jonathan Moore Liles 10 years ago
parent
commit
5ab7d7c410
2 changed files with 3 additions and 4 deletions
  1. +1
    -2
      mixer/src/Module_Parameter_Editor.C
  2. +2
    -2
      nonlib/OSC/Endpoint.C

+ 1
- 2
mixer/src/Module_Parameter_Editor.C View File

@@ -325,8 +325,7 @@ Module_Parameter_Editor::make_controls ( void )

controls_by_port[i] = w;

w->tooltip( p->osc_path() );

w->copy_tooltip( p->osc_path() );

_callback_data.push_back( callback_data( this, i ) );



+ 2
- 2
nonlib/OSC/Endpoint.C View File

@@ -89,7 +89,7 @@ namespace OSC
Signal::rename ( const char *path )
{
char *new_path;
asprintf( &new_path, "%s%s", _endpoint->name(), path );
asprintf( &new_path, "%s%s", _endpoint->name() ? _endpoint->name() : "", path );

DMESSAGE( "Renaming signal %s to %s", this->path(), new_path );

@@ -962,7 +962,7 @@ namespace OSC
Endpoint::add_signal ( const char *path, Signal::Direction dir, float min, float max, float default_value, signal_handler handler, void *user_data )
{
char *s;
asprintf( &s, "%s%s", name(), path );
asprintf( &s, "%s%s", name() ? name() : "", path );

Signal *o = new Signal( s, dir );


Loading…
Cancel
Save