From 4feb8d6a9a901b5fb38bfa88bdacb88437a87ef5 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 2 May 2008 23:44:48 -0500 Subject: [PATCH] Bring debugging messages over from Non-Sequencer. Begin to support session directories. Show session name in TLE. --- Timeline/Loggable.H | 2 +- Timeline/Playback_DS.C | 11 ++-- Timeline/Record_DS.C | 9 +-- Timeline/TLE.fl | 10 +++- Timeline/main.C | 131 ++++++++++++++++++++++++++++++++--------- Timeline/makefile.inc | 4 +- debug.C | 60 +++++++++++++++++++ debug.h | 116 ++++++++++++++++++++++++++++++++++++ 8 files changed, 303 insertions(+), 40 deletions(-) create mode 100644 debug.C create mode 100644 debug.h diff --git a/Timeline/Loggable.H b/Timeline/Loggable.H index e35fe73..1858ec5 100644 --- a/Timeline/Loggable.H +++ b/Timeline/Loggable.H @@ -169,7 +169,7 @@ public: void register_create ( const char *name, create_func *func ) { - printf( "registering %s to %p\n", name, func ); +// printf( "registering %s to %p\n", name, func ); _class_map[ string( name ) ] = func; } diff --git a/Timeline/Playback_DS.C b/Timeline/Playback_DS.C index cbff36a..d41f152 100644 --- a/Timeline/Playback_DS.C +++ b/Timeline/Playback_DS.C @@ -31,6 +31,8 @@ #include "dsp.h" +#include "debug.h" + bool Playback_DS::seek_pending ( void ) { @@ -45,7 +47,7 @@ Playback_DS::seek_pending ( void ) void Playback_DS::seek ( nframes_t frame ) { - printf( "requesting seek\n" ); + DMESSAGE( "requesting seek" ); if ( seek_pending() ) printf( "seek error, attempt to seek while seek is pending\n" ); @@ -92,7 +94,7 @@ void Playback_DS::disk_thread ( void ) { - printf( "IO thread running...\n" ); + DMESSAGE( "playback thread running" ); /* buffer to hold the interleaved data returned by the track reader */ sample_t *buf = new sample_t[ _nframes * channels() * _disk_io_blocks ]; @@ -111,7 +113,8 @@ Playback_DS::disk_thread ( void ) if ( seek_pending() ) { - printf( "performing seek\n" ); + DMESSAGE( "performing seek" ); + _frame = _pending_seek; _pending_seek = -1; blocks_ready = 1; @@ -189,7 +192,7 @@ Playback_DS::disk_thread ( void ) } - printf( "IO thread terminating.\n" ); + DMESSAGE( "playback thread terminating" ); delete[] buf; #ifndef AVOID_UNNECESSARY_COPYING diff --git a/Timeline/Record_DS.C b/Timeline/Record_DS.C index bfd5fec..8f1777e 100644 --- a/Timeline/Record_DS.C +++ b/Timeline/Record_DS.C @@ -29,6 +29,8 @@ #include "dsp.h" +#include "debug.h" + /* THREAD: IO */ /** write /nframes/ from buf to the capture file of the attached track */ void @@ -54,7 +56,7 @@ Record_DS::write_block ( sample_t *buf, nframes_t nframes ) void Record_DS::disk_thread ( void ) { - printf( "IO thread running...\n" ); + DMESSAGE( "capture thread running..." ); const nframes_t nframes = _nframes * _disk_io_blocks; @@ -134,8 +136,7 @@ Record_DS::disk_thread ( void ) } - printf( "IO thread terminating.\n" ); - + DMESSAGE( "capture thread terminating" ); /* flush what remains in the buffer out to disk */ @@ -232,7 +233,7 @@ Record_DS::stop ( nframes_t frame ) _th->stop( frame ); - printf( "recording finished\n" ); + DMESSAGE( "recording finished" ); } diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl index aca2f33..6e6a8be 100644 --- a/Timeline/TLE.fl +++ b/Timeline/TLE.fl @@ -31,6 +31,9 @@ decl {\#include } {} decl {\#include } {} +decl {extern char session_display_name[256];} {global +} + decl {extern char *user_config_dir;} {global } @@ -227,7 +230,7 @@ exit( 0 );} } MenuItem {} { label {&Fit} - callback {timeline->zoom_fit();} selected + callback {timeline->zoom_fit();} xywh {10 10 40 25} divider } MenuItem {} { @@ -532,6 +535,11 @@ delete win;} code0 {timeline = o;} class Timeline } + Fl_Box {} { + label {} selected + xywh {450 0 475 22} labeltype SHADOW_LABEL labelfont 2 + code0 {o->label( session_display_name );} + } Fl_Value_Output xruns_output { label {xruns:} xywh {980 2 44 20} maximum 40000 step 1 diff --git a/Timeline/main.C b/Timeline/main.C index 402f3db..1bd2975 100644 --- a/Timeline/main.C +++ b/Timeline/main.C @@ -17,22 +17,8 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ - #include -#include -#include -#include -#include -// #include -#include -#include -#include -#include - -#include "Scalebar.H" - -// #include "Waveform.H" -#include "Region.H" + #include #include @@ -40,6 +26,7 @@ #include #include +#include "Region.H" #include "Sequence.H" #include "Audio_Sequence.H" #include "Timeline.H" @@ -55,8 +42,6 @@ #include "Engine.H" -// #include "Clock.H" - #include "TLE.H" #include "../FL/Boxtypes.H" @@ -64,28 +49,94 @@ #include #include + Engine *engine; Timeline *timeline; Transport *transport; -/* void cb_undo ( Fl_Widget *w, void *v ) */ -/* { */ -/* Loggable::undo(); */ -/* } */ +#define VERSION "0.5.0" + +/* TODO: put these in a header */ +#define USER_CONFIG_DIR ".non-daw/" + +const char APP_NAME[] = "Non-DAW"; +const char APP_TITLE[] = "The Non-DAW (Digital Audio Workstation)"; +const char COPYRIGHT[] = "Copyright (C) 2008 Jonathan Moore Liles"; + +#define PACKAGE "non" + + +#include "debug.h" char *user_config_dir; +char session_display_name[256]; + +void +set_display_name ( const char *name ) +{ + char *s = rindex( name, '/' ); + + strcpy( session_display_name, s ? s : name ); + + for ( s = session_display_name; *s; ++s ) + if ( *s == '_' || *s == '-' ) + *s = ' '; +} + +static int +exists ( const char *name ) +{ + struct stat st; + + return 0 == stat( name, &st ); +} + +#include static int ensure_dirs ( void ) { - asprintf( &user_config_dir, "%s/.non-daw", getenv( "HOME" ) ); + asprintf( &user_config_dir, "%s/%s", getenv( "HOME" ), USER_CONFIG_DIR ); - return 0 == mkdir( user_config_dir, 0777 ); + int r = mkdir( user_config_dir, 0777 ); + + return r == 0 || errno == EEXIST; +} + +bool +create_session ( const char *name ) +{ + if ( exists( name ) ) + { + WARNING( "Session already exists" ); + return false; + } + + if ( mkdir( name, 0777 ) ) + { + WARNING( "Cannot create session directory" ); + return false; + } + + if ( chdir( name ) ) + FATAL( "WTF? Cannot change to new session directory" ); + + mkdir( "sources", 0777 ); + + set_display_name( name ); + + /* TODO: load template */ + + + return true; } int main ( int argc, char **argv ) { + + *session_display_name = '\0'; + /* welcome to C++ */ LOG_REGISTER_CREATE( Region ); LOG_REGISTER_CREATE( Time_Point ); @@ -96,16 +147,37 @@ main ( int argc, char **argv ) LOG_REGISTER_CREATE( Audio_Sequence ); LOG_REGISTER_CREATE( Control_Sequence ); - init_boxtypes(); if ( ! ensure_dirs() ) - /* error */; + FATAL( "Cannot create required directories" ); + + printf( "%s %s -- %s\n", APP_TITLE, VERSION, COPYRIGHT ); + + const char *pwd = getenv( "PWD" ); - /* TODO: change to seesion dir */ + if ( argc > 1 ) + { + /* FIXME: what about FLTK arguments? */ + + /* change to session dir */ + if ( chdir( argv[ 1 ] ) ) + FATAL( "Cannot change to session dir \"%s\"", argv[ 1 ] ); + else + pwd = argv[ 1 ]; + } + + if ( ! exists( "history" ) || + ! exists( "sources" ) ) +// ! exists( "options" ) ) + FATAL( "Not a Non-DAW session: \"%s\"", pwd ); + + set_display_name( pwd ); TLE tle; + MESSAGE( "Initializing JACK" ); + /* we don't really need a pointer for this */ engine = new Engine; engine->init(); @@ -114,11 +186,12 @@ main ( int argc, char **argv ) * scenario requiring otherwise */ transport->stop(); + MESSAGE( "Opening session" ); Loggable::open( "history" ); -// Fl::add_timeout( UPDATE_FREQ, clock_update_cb, o ); - - tle.main_window->show( argc, argv ); + MESSAGE( "Starting GUI" ); +// tle.main_window->show( argc, argv ); + tle.main_window->show(); Fl::run(); } diff --git a/Timeline/makefile.inc b/Timeline/makefile.inc index 2eb026c..51bd3c6 100644 --- a/Timeline/makefile.inc +++ b/Timeline/makefile.inc @@ -1,4 +1,6 @@ +Timeline_VERSION := 0.5.0 + Timeline_SRCS= \ Timeline/Audio_File.C \ Timeline/Audio_File_SF.C \ @@ -26,12 +28,12 @@ Timeline/Transport.C \ Timeline/Waveform.C \ Timeline/dsp.C \ Timeline/main.C \ +debug.C \ Timeline_OBJS:=$(Timeline_SRCS:.C=.o) $(Timeline_OBJS): Makefile - Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) Timeline/timeline: $(Timeline_OBJS) FL diff --git a/debug.C b/debug.C new file mode 100644 index 0000000..d786914 --- /dev/null +++ b/debug.C @@ -0,0 +1,60 @@ + +/*******************************************************************************/ +/* Copyright (C) 2008 Jonathan Moore Liles */ +/* */ +/* This program is free software; you can redistribute it and/or modify it */ +/* under the terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2 of the License, or (at your */ +/* option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, but WITHOUT */ +/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */ +/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */ +/* more details. */ +/* */ +/* You should have received a copy of the GNU General Public License along */ +/* with This program; see the file COPYING. If not,write to the Free Software */ +/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*******************************************************************************/ + +#include "debug.h" + +void +warnf ( warning_t level, + const char *module, + const char *file, + const char *function, size_t line, const char *fmt, ... ) +{ + va_list args; + static const char *level_tab[] = { + "message", "\033[1;32m", + "warning", "\033[1;33m", + "assertion", "\033[1;31m" + }; + + if ( module ) + fprintf( stderr, "[%s] ", module ); +#ifndef NDEBUG + if ( file ) + fprintf( stderr, "%s", file ); + if ( line ) + fprintf( stderr, ":%i", line ); + if ( function ) + fprintf( stderr, " %s()", function ); + + fprintf( stderr, ": " ); +#endif + + if ( unsigned( ( level << 1 ) + 1 ) < + ( sizeof( level_tab ) / sizeof( level_tab[0] ) ) ) + fprintf( stderr, "%s", level_tab[( level << 1 ) + 1] ); + + if ( fmt ) + { + va_start( args, fmt ); + vfprintf( stderr, fmt, args ); + va_end( args ); + } + + fprintf( stderr, "\033[0m\n" ); +} diff --git a/debug.h b/debug.h new file mode 100644 index 0000000..0baf871 --- /dev/null +++ b/debug.h @@ -0,0 +1,116 @@ + +/*******************************************************************************/ +/* Copyright (C) 2008 Jonathan Moore Liles */ +/* */ +/* This program is free software; you can redistribute it and/or modify it */ +/* under the terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2 of the License, or (at your */ +/* option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, but WITHOUT */ +/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */ +/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */ +/* more details. */ +/* */ +/* You should have received a copy of the GNU General Public License along */ +/* with This program; see the file COPYING. If not,write to the Free Software */ +/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*******************************************************************************/ + +/* debug.h + * + * 11/21/2003 - Jonathan Moore Liles + * + * Debuging support. + * + * Disable by defining the preprocessor variable NDEBUG prior to inclusion. + * + * The following macros sould be defined as string literals + * + * name value + * + * __MODULE__ Name of module. eg. "libfoo" + * + * __FILE__ Name of file. eg. "foo.c" + * + * __FUNCTION__ Name of enclosing function. eg. "bar" + * + * (inteter literal) + * __LINE__ Number of enclosing line. + * + * + * __FILE__, and __LINE__ are automatically defined by standard CPP + * implementations. __FUNCTION__ is more or less unique to GNU, and isn't + * strictly a preprocessor macro, but rather a reserved word in the compiler. + * There is a sed script available with this toolset that is able to fake + * __FUNCTION__ (among other things) with an extra preprocesessing step. + * + * __MODULE__ is nonstandard and should be defined the enclosing program(s). + * Autoconf defines PACKAGE as the module name, and these routines will use its + * value instead if __MODULE__ is undefined. + * + * The following routines are provided (as macros) and take the same arguments + * as printf(): + * + * MESSAGE( const char *format, ... ) + * WARNING( const char *format, ... ) + * FATAL( const char *format, ... ) + * + * Calling MESSAGE or WARNING prints the message to stderr along with module, + * file and line information, as well as appropriate emphasis. Calling + * FATAL will do the same, and then call abort() to end the program. It is + * unwise to supply any of these marcros with arguments that produce side + * effects. As, doing so will most likely result in Heisenbugs; program + * behavior that changes when debugging is disabled. + * + */ + + +#ifndef _DEBUG_H +#define _DEBUG_H + +#ifndef __MODULE__ +#ifdef PACKAGE +#define __MODULE__ PACKAGE +#else +#define __MODULE__ NULL +#endif +#endif + +#ifndef __GNUC__ + #define __FUNCTION__ NULL +#endif + +#include +#include +#include + +typedef enum { + W_MESSAGE = 0, + W_WARNING, + W_FATAL +} warning_t; + +void +warnf ( warning_t level, + const char *module, + const char *file, + const char *function, size_t line, const char *fmt, ... ); + + +#ifndef NDEBUG +#define DMESSAGE( fmt, args... ) warnf( W_MESSAGE, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ) +#define DWARNING( fmt, args... ) warnf( W_WARNING, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ) +#define ASSERT( pred, fmt, args... ) do { if ( ! (pred) ) { warnf( W_FATAL, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ); abort(); } } while ( 0 ) +#else +#define DMESSAGE( fmt, args... ) +#define DWARNING( fmt, args... ) +#define ASSERT( pred, fmt, args... ) +#endif + +/* these are always defined */ +#define MESSAGE( fmt, args... ) warnf( W_MESSAGE, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ) +#define WARNING( fmt, args... ) warnf( W_WARNING, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ) +#define FATAL( fmt, args... ) ( warnf( W_FATAL, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ), abort() ) + +#endif