-Track names saved/reloaded with JSON
parent
05702236d4
commit
699e94e090
|
@ -32,6 +32,7 @@
|
||||||
namespace Avtk
|
namespace Avtk
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// FIXME: Refactor to .hxx .cxx
|
||||||
class Background : public Fl_Widget
|
class Background : public Fl_Widget
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -45,8 +46,6 @@ class Background : public Fl_Widget
|
||||||
|
|
||||||
label = strdup(_label);
|
label = strdup(_label);
|
||||||
|
|
||||||
//printf("AVTK background label: %s\n", label );
|
|
||||||
|
|
||||||
highlight = false;
|
highlight = false;
|
||||||
}
|
}
|
||||||
bool highlight;
|
bool highlight;
|
||||||
|
@ -59,6 +58,7 @@ class Background : public Fl_Widget
|
||||||
free( (char*) label);
|
free( (char*) label);
|
||||||
|
|
||||||
label = strdup( l );
|
label = strdup( l );
|
||||||
|
redraw();
|
||||||
}
|
}
|
||||||
const char* getLabel()
|
const char* getLabel()
|
||||||
{
|
{
|
||||||
|
@ -81,26 +81,6 @@ class Background : public Fl_Widget
|
||||||
cairo_set_source_rgba( cr, 28 / 255.f, 28 / 255.f , 28 / 255.f , 1 );
|
cairo_set_source_rgba( cr, 28 / 255.f, 28 / 255.f , 28 / 255.f , 1 );
|
||||||
cairo_fill( cr );
|
cairo_fill( cr );
|
||||||
|
|
||||||
/*
|
|
||||||
// set up dashed lines, 1 px off, 1 px on
|
|
||||||
double dashes[1];
|
|
||||||
dashes[0] = 2.0;
|
|
||||||
|
|
||||||
cairo_set_dash ( cr, dashes, 1, 0.0);
|
|
||||||
cairo_set_line_width( cr, 1.0);
|
|
||||||
|
|
||||||
// loop over each 2nd line, drawing dots
|
|
||||||
for ( int i = x; i < x + w; i += 4 )
|
|
||||||
{
|
|
||||||
cairo_move_to( cr, i, y );
|
|
||||||
cairo_line_to( cr, i, y + h );
|
|
||||||
}
|
|
||||||
|
|
||||||
cairo_set_source_rgba( cr, 28 / 255.f, 28 / 255.f , 28 / 255.f , 0.5 );
|
|
||||||
cairo_stroke(cr);
|
|
||||||
cairo_set_dash ( cr, dashes, 0, 0.0);
|
|
||||||
*/
|
|
||||||
|
|
||||||
// draw header
|
// draw header
|
||||||
// backing
|
// backing
|
||||||
cairo_rectangle(cr, x, y, w, 20);
|
cairo_rectangle(cr, x, y, w, 20);
|
||||||
|
|
|
@ -262,6 +262,11 @@ void DiskReader::readTracks()
|
||||||
|
|
||||||
readScenes( t, track );
|
readScenes( t, track );
|
||||||
|
|
||||||
|
// name
|
||||||
|
{
|
||||||
|
cJSON* name = cJSON_GetObjectItem( track, "name");
|
||||||
|
gui->getTrack(t)->bg.setLabel( name->valuestring );
|
||||||
|
}
|
||||||
// fader
|
// fader
|
||||||
{
|
{
|
||||||
cJSON* fader = cJSON_GetObjectItem( track, "fader");
|
cJSON* fader = cJSON_GetObjectItem( track, "fader");
|
||||||
|
|
|
@ -134,6 +134,7 @@ void DiskWriter::writeSession( std::string path, std::string sessionName )
|
||||||
|
|
||||||
// add track metadata: volumes, sends etc
|
// add track metadata: volumes, sends etc
|
||||||
cJSON_AddNumberToObject( track, "ID", t );
|
cJSON_AddNumberToObject( track, "ID", t );
|
||||||
|
cJSON_AddStringToObject( track, "name", gui->getTrack(t)->bg.getLabel() );
|
||||||
|
|
||||||
cJSON_AddNumberToObject( track, "fader", gui->getTrack(t)->getVolume()->value() );
|
cJSON_AddNumberToObject( track, "fader", gui->getTrack(t)->getVolume()->value() );
|
||||||
cJSON_AddNumberToObject( track, "side", gui->getTrack(t)->side.value() );
|
cJSON_AddNumberToObject( track, "side", gui->getTrack(t)->side.value() );
|
||||||
|
|
Loading…
Reference in New Issue