mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more status line output.

This commit is contained in:
Jonathan Moore Liles 2008-02-12 12:21:42 -06:00
parent 58c2dad706
commit 6447678a08
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -10,9 +10,9 @@ DOCUMENT_PATH=$(PREFIX)/share/doc/non-sequencer/
USE_LASH=1 USE_LASH=1
# Debugging # Debugging
# CFLAGS:=-O0 -ggdb -fno-omit-frame-pointer -Wall CFLAGS:=-O0 -ggdb -fno-omit-frame-pointer -Wall
# Production # Production
CFLAGS:=-O3 -fomit-frame-pointer -DNDEBUG # CFLAGS:=-O3 -fomit-frame-pointer -DNDEBUG
CFLAGS+=-DINSTALL_PREFIX=\"$(PREFIX)\" \ CFLAGS+=-DINSTALL_PREFIX=\"$(PREFIX)\" \
-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \ -DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \

19
gui/ui.fl
View File

@ -169,6 +169,9 @@ if ( maybe_save_song() )
update_pattern_widgets(); update_pattern_widgets();
update_sequence_widgets(); update_sequence_widgets();
update_phrase_widgets(); update_phrase_widgets();
gui_status( "New song." );
}} }}
xywh {0 0 40 25} xywh {0 0 40 25}
} }
@ -180,6 +183,8 @@ if ( name )
{ {
if ( ! load_song( name ) ) if ( ! load_song( name ) )
fl_alert( "Could not load song!" ); fl_alert( "Could not load song!" );
else
gui_status( "Song opened." );
update_sequence_widgets(); update_sequence_widgets();
update_pattern_widgets(); update_pattern_widgets();
@ -192,7 +197,7 @@ if ( name )
} }
MenuItem menu_save { MenuItem menu_save {
label {&Save} label {&Save}
callback {save_dialog( song.filename );} selected callback {save_dialog( song.filename );}
xywh {0 0 40 25} shortcut 0x40073 color 37 deactivate xywh {0 0 40 25} shortcut 0x40073 color 37 deactivate
code0 {song.signal_dirty.connect( sigc::mem_fun( o, &Fl_Menu_Item::activate ) );} code0 {song.signal_dirty.connect( sigc::mem_fun( o, &Fl_Menu_Item::activate ) );}
code1 {song.signal_clean.connect( sigc::mem_fun( o, &Fl_Menu_Item::deactivate ) );} code1 {song.signal_clean.connect( sigc::mem_fun( o, &Fl_Menu_Item::deactivate ) );}
@ -950,8 +955,8 @@ else
} }
} }
} }
Fl_Output status { Fl_Output status {selected
xywh {3 776 861 21} box NO_BOX color 32 labeltype NO_LABEL textcolor 55 xywh {0 776 869 25} box UP_BOX color 32 labeltype NO_LABEL textcolor 55
} }
} }
} }
@ -1183,7 +1188,7 @@ if ( phrase_c->grid() )
return 0;} {} return 0;} {}
} }
Function {save_dialog( const char *name )} {return_type void Function {save_dialog( const char *name )} {open return_type void
} { } {
code {if ( ! name ) code {if ( ! name )
{ {
@ -1203,7 +1208,9 @@ return 0;} {}
} }
if ( ! save_song( name ) ) if ( ! save_song( name ) )
fl_alert( "Could not save song" );} {} fl_alert( "Could not save song" );
else
gui_status( "Saved." );} {}
} }
Function {show_help_dialog( const char *file )} {return_type void Function {show_help_dialog( const char *file )} {return_type void
} { } {
@ -1222,7 +1229,7 @@ help->show();
// FIXME: need to delete it somehow. // FIXME: need to delete it somehow.
// help->show(1, argv);} {} // help->show(1, argv);} {}
} }
Function {maybe_save_song()} {return_type bool Function {maybe_save_song()} {open return_type bool
} { } {
code {if ( song.dirty() ) code {if ( song.dirty() )
{ {

1
smf.C
View File

@ -947,7 +947,6 @@ smf::track_listing ( void )
int i; int i;
long where = ftell( _fp ); long where = ftell( _fp );
MESSAGE( "@ %lu", where );
for ( i = 0; next_track(); ++i ) for ( i = 0; next_track(); ++i )
{ {

10
transport.H
View File

@ -21,13 +21,15 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
using namespace sigc;
#include "event.H" // just for tick_t #include "event.H" // just for tick_t
#include <jack/transport.h> #include <jack/transport.h>
typedef double playhead_t; typedef double playhead_t;
class Transport : public sigc::trackable { class Transport : public trackable {
double _master_beats_per_minute; double _master_beats_per_minute;
unsigned _master_beats_per_bar; unsigned _master_beats_per_bar;
@ -35,9 +37,9 @@ class Transport : public sigc::trackable {
public: public:
sigc::signal <int, double> signal_tempo_change; signal <int, double> signal_tempo_change;
sigc::signal <int, double> signal_bpb_change; signal <int, double> signal_bpb_change;
sigc::signal <int, double> signal_beat_change; signal <int, double> signal_beat_change;
bool master; /* are we driving the transport? */ bool master; /* are we driving the transport? */
bool rolling; bool rolling;