diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C index 4ec1b1c..450530b 100644 --- a/mixer/src/Mixer.C +++ b/mixer/src/Mixer.C @@ -321,11 +321,11 @@ void Mixer::cb_menu(Fl_Widget* o) { ab.logo_box->label( VERSION ); - ab.title->label( "The Non Mixer" ); + ab.title->label( "Non Mixer" ); - ab.copyright->label( "Copyright (C) 2008-2010 Jonathan Moore Liles" ); + ab.copyright->label( "Copyright (C) 2008-2013 Jonathan Moore Liles" ); ab.credits->label( - "Non-Mixer was written from scratch by\n" + "Non Mixer was written from scratch by\n" "Jonathan Moore Liles for his own use\n" "(see the manual).\n" "\n" @@ -334,7 +334,7 @@ void Mixer::cb_menu(Fl_Widget* o) { "and/or replacing the rest of Linux Audio\n" "with fast, light, reliable alternatives.\n" ); - ab.website_url->label( "http://non-mixer.tuxfamily.org" ); + ab.website_url->label( "http://non.tuxfamily.org" ); ab.run(); } diff --git a/mixer/src/main.C b/mixer/src/main.C index cd233c9..9c2c85a 100644 --- a/mixer/src/main.C +++ b/mixer/src/main.C @@ -69,7 +69,7 @@ const double NSM_CHECK_INTERVAL = 0.25f; -const char COPYRIGHT[] = "Copyright (c) 2008-2012 Jonathan Moore Liles"; +const char COPYRIGHT[] = "Copyright (c) 2008-2013 Jonathan Moore Liles"; char *user_config_dir; Mixer *mixer; @@ -240,7 +240,7 @@ main ( int argc, char **argv ) Fl_Double_Window *main_window; { - Fl_Double_Window *o = main_window = new Fl_Double_Window( 800, 600, "Non-DAW : Mixer" ); + Fl_Double_Window *o = main_window = new Fl_Double_Window( 800, 600, "Non Mixer" ); { main_window->xclass( APP_NAME ); diff --git a/sequencer/src/const.h b/sequencer/src/const.h index 31d27e1..0dbb4e9 100644 --- a/sequencer/src/const.h +++ b/sequencer/src/const.h @@ -31,7 +31,7 @@ const double TRANSPORT_POLL_INTERVAL = 0.05; const char APP_NAME[] = "Non-Sequencer"; const char APP_TITLE[] = "The Non-Sequencer"; -const char COPYRIGHT[] = "Copyright (c) 2007-2012 Jonathan Moore Liles"; +const char COPYRIGHT[] = "Copyright (c) 2007-2013 Jonathan Moore Liles"; #define PACKAGE "non-sequencer" diff --git a/sequencer/src/gui/ui.fl b/sequencer/src/gui/ui.fl index e207ec9..9fb7d71 100644 --- a/sequencer/src/gui/ui.fl +++ b/sequencer/src/gui/ui.fl @@ -1236,12 +1236,12 @@ config.follow_playhead = val ? true : false;} ab.logo_box->label( VERSION ); - ab.title->label( "The Non Sequencer" ); + ab.title->label( "Non Sequencer" ); - ab.copyright->label( "Copyright (C) 2007-2012 Jonathan Moore Liles" ); - ab.credits->label( "Non-Sequencer was written from scratch by\\nJonathan Moore Liles for his own use\\n(see the manual).\\n\\nNobody planned. Nobody helped.\\nYou can help now by donating time, money,\\nand/or replacing the rest of Linux Audio\\nwith fast, light, reliable alternatives.\\n" ); + ab.copyright->label( "Copyright (C) 2007-2013 Jonathan Moore Liles" ); + ab.credits->label( "Non Sequencer was written from scratch by\\nJonathan Moore Liles for his own use\\n(see the manual).\\n\\nNobody planned. Nobody helped.\\nYou can help now by donating time, money,\\nand/or replacing the rest of Linux Audio\\nwith fast, light, reliable alternatives.\\n" ); - ab.website_url->label( "http://non-sequencer.tuxfamily.org" ); + ab.website_url->label( "http://non.tuxfamily.org" ); ab.run();} xywh {0 0 40 25} color 37 diff --git a/timeline/doc/MANUAL.html b/timeline/doc/MANUAL.html index b7b12d2..9d2219d 100644 --- a/timeline/doc/MANUAL.html +++ b/timeline/doc/MANUAL.html @@ -3,12 +3,12 @@ -Non DAW User Manual +Non Timeline User Manual
-

Non DAW User Manual

+

Non Timeline User Manual

Jonathan Moore Liles <male@tuxfamily.org>
@@ -20,7 +20,7 @@ Jonathan Moore Liles <male@tuxfamily.org&

Table Of Contents

1. User Manual

-

1.1. The Timeline Editor

+

1.1. The Timeline

Fig. 1.1. Timeline Editor @@ -99,7 +99,7 @@ Jonathan Moore Liles <male@tuxfamily.org&
fig. 1.1

-The Timeline Editor is what you first see when you start the Non-DAW. Here you will add tracks, make captures, and arrange regions. +The Timeline is where you will add tracks, make captures, and arrange regions.

Before you can add anything to the timeline, you must create a new project (menu item Project/New) @@ -183,14 +183,14 @@ Any number of punch cursors may be defined. fig. 1.5

-A Non-DAW project is a directory where Non-DAW keeps the journal, project specific settings, notes, some meta-data, and, last but not least, your audio sources. A project is completely self-contained. You can rename a project as simply as: +A Non Timeline project is a directory where Non Timeline keeps the journal, project specific settings, notes, some meta-data, and, last but not least, your audio sources. A project is completely self-contained. You can rename a project as simply as: 

 $ mv Project-A Project-B

-Non-DAW projects can refer to audio sources outside of the project directory--clips dropped onto the timeline from a file-manager, for instance. These are not copied into the project by default. This allows the efficient use of audio loop libraries, but introduces external dependencies. Beware that if you ever move, remove, or change one of these external sources, it will affect the Non-DAW projects referencing them. +Non Timeline projects can refer to audio sources outside of the project directory--clips dropped onto the timeline from a file-manager, for instance. These are not copied into the project by default. This allows the efficient use of audio loop libraries, but introduces external dependencies. Beware that if you ever move, remove, or change one of these external sources, it will affect the Non Timeline projects referencing them.

@@ -239,7 +239,7 @@ The clocks tell you precisely where the playhead is. There are several clock typ
fig. 1.8

-The tempo map serves a dual purpose. Firstly, it provides enough information about the musical structure of your project for Non-DAW to perform intelligent snapping and draw helpful measure lines. Secondly, the tempo map is communicated to other JACK clients at playback time via the JACK Timebase API, so that MIDI accompaniment can follow along to the tempo changes in your song. +The tempo map serves a dual purpose. Firstly, it provides enough information about the musical structure of your project for Non Timeline to perform intelligent snapping and draw helpful measure lines. Secondly, the tempo map is communicated to other JACK clients at playback time via the JACK Timebase API, so that MIDI accompaniment can follow along to the tempo changes in your song.

Clicking on an empty part of the time or tempo sequences will prompt you for the parameters of a new time or tempo point to be inserted at that position. Hit Escape to cancel the insertion. Right-click on a time or tempo point to edit its value. Existing points can be dragged freely. @@ -272,7 +272,7 @@ Sequence is the generic term used to describe all distinct sequences of objects

1.1.10. Regions

-Regions are the most common object on the timeline. Each region represents some portion of an audio source placed at some position in time. Since Non-DAW is non-destructive, regions only represent the source--altering a region does not affect the audio source in any way. Deleting a region does not delete the source--as other regions may still refer to it. +Regions are the most common object on the timeline. Each region represents some portion of an audio source placed at some position in time. Since Non Timeline is non-destructive, regions only represent the source--altering a region does not affect the audio source in any way. Deleting a region does not delete the source--as other regions may still refer to it.

@@ -337,7 +337,7 @@ Each region has fade in and out curves. Position the mouse pointer over the desi
fig. 1.12

-Instead of requiring you to duplicate a small region 100 times to achieve a looping effect, Non DAW supports looping directly. First, adjust the region duration to cover the amount of time you would like it to loop for. Then, position the mouse pointer over the first place the loop should repeat (i.e. the first bar line after the start of the region) and hit L. This will set the loop point for this region, which will be indicated by two white arrows. At playback, the portion of the region before the loop point will loop for the duration of the region. +Instead of requiring you to duplicate a small region 100 times to achieve a looping effect, Non Timeline supports looping directly. First, adjust the region duration to cover the amount of time you would like it to loop for. Then, position the mouse pointer over the first place the loop should repeat (i.e. the first bar line after the start of the region) and hit L. This will set the loop point for this region, which will be indicated by two white arrows. At playback, the portion of the region before the loop point will loop for the duration of the region.

1.1.11. Annotation

diff --git a/timeline/doc/MANUAL.mu b/timeline/doc/MANUAL.mu index 7e24510..36e5050 100644 --- a/timeline/doc/MANUAL.mu +++ b/timeline/doc/MANUAL.mu @@ -1,18 +1,17 @@ -! title Non DAW User Manual +! title Non Timeline User Manual ! author Jonathan Moore Liles #(email,male@tuxfamily.org) -- Table Of Contents : User Manual -:: The Timeline Editor +:: The Timeline / Timeline Editor < tle.png - The Timeline Editor is what you first see when you start the Non-DAW. Here - you will add tracks, make captures, and arrange regions. + The Timeline is where you will add tracks, make captures, and arrange regions. Before you can add anything to the timeline, you must create a new project (menu item `Project\/New`) @@ -101,19 +100,19 @@ / Project Info Dialog < project-info.png - A Non-DAW project is a directory where Non-DAW keeps the journal, project + A Non Timeline project is a directory where Non Timeline keeps the journal, project specific settings, notes, some meta-data, and, last but not least, your audio sources. A project is completely self-contained. You can rename a project as simply as: > $ mv Project-A Project-B - Non-DAW projects can refer to audio sources outside of the project + Non Timeline projects can refer to audio sources outside of the project directory--clips dropped onto the timeline from a file-manager, for instance. These are not copied into the project by default. This allows the efficient use of audio loop libraries, but introduces external dependencies. Beware that if you ever move, remove, or change one of these external sources, it - will affect the Non-DAW projects referencing them. + will affect the Non Timeline projects referencing them. / Note: { To import all the external sources for a project, making it suitable for @@ -153,7 +152,7 @@ < tempomap.png The tempo map serves a dual purpose. Firstly, it provides enough information - about the musical structure of your project for Non-DAW to perform + about the musical structure of your project for Non Timeline to perform intelligent snapping and draw helpful measure lines. Secondly, the tempo map is communicated to other JACK clients at playback time via the JACK Timebase API, so that MIDI accompaniment can follow along to the tempo changes in your @@ -202,7 +201,7 @@ Regions are the most common object on the timeline. Each region represents some portion of an audio source placed at some position in time. Since - Non-DAW is non-destructive, regions only *represent* the source--altering a + Non Timeline is non-destructive, regions only *represent* the source--altering a region does not affect the audio source in any way. Deleting a region does not delete the source--as other regions may still refer to it. @@ -275,7 +274,7 @@ < looping.png Instead of requiring you to duplicate a small region 100 times to achieve a - looping effect, Non DAW supports looping directly. First, adjust the region + looping effect, Non Timeline supports looping directly. First, adjust the region duration to cover the amount of time you would like it to loop for. Then, position the mouse pointer over the first place the loop should repeat (i.e. the first bar line after the start of the region) and hit `L`. This will set diff --git a/timeline/icons/hicolor/128x128/apps/non-daw.png b/timeline/icons/hicolor/128x128/apps/non-daw.png deleted file mode 100644 index 88aafa3..0000000 Binary files a/timeline/icons/hicolor/128x128/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/128x128/apps/non-timeline.png b/timeline/icons/hicolor/128x128/apps/non-timeline.png new file mode 100644 index 0000000..e15716a Binary files /dev/null and b/timeline/icons/hicolor/128x128/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/16x16/apps/non-daw.png b/timeline/icons/hicolor/16x16/apps/non-daw.png deleted file mode 100644 index f8bb8b9..0000000 Binary files a/timeline/icons/hicolor/16x16/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/16x16/apps/non-timeline.png b/timeline/icons/hicolor/16x16/apps/non-timeline.png new file mode 100644 index 0000000..1738168 Binary files /dev/null and b/timeline/icons/hicolor/16x16/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/192x192/apps/non-daw.png b/timeline/icons/hicolor/192x192/apps/non-daw.png deleted file mode 100644 index f31caff..0000000 Binary files a/timeline/icons/hicolor/192x192/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/192x192/apps/non-timeline.png b/timeline/icons/hicolor/192x192/apps/non-timeline.png new file mode 100644 index 0000000..c50fb65 Binary files /dev/null and b/timeline/icons/hicolor/192x192/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/256x256/apps/non-daw.png b/timeline/icons/hicolor/256x256/apps/non-daw.png deleted file mode 100644 index cec606f..0000000 Binary files a/timeline/icons/hicolor/256x256/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/256x256/apps/non-timeline.png b/timeline/icons/hicolor/256x256/apps/non-timeline.png new file mode 100644 index 0000000..180125c Binary files /dev/null and b/timeline/icons/hicolor/256x256/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/32x32/apps/non-daw.png b/timeline/icons/hicolor/32x32/apps/non-daw.png deleted file mode 100644 index 0329d81..0000000 Binary files a/timeline/icons/hicolor/32x32/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/32x32/apps/non-timeline.png b/timeline/icons/hicolor/32x32/apps/non-timeline.png new file mode 100644 index 0000000..4894b5a Binary files /dev/null and b/timeline/icons/hicolor/32x32/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/36x36/apps/non-daw.png b/timeline/icons/hicolor/36x36/apps/non-daw.png deleted file mode 100644 index 55cd6d9..0000000 Binary files a/timeline/icons/hicolor/36x36/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/36x36/apps/non-timeline.png b/timeline/icons/hicolor/36x36/apps/non-timeline.png new file mode 100644 index 0000000..018f4b2 Binary files /dev/null and b/timeline/icons/hicolor/36x36/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/48x48/apps/non-daw.png b/timeline/icons/hicolor/48x48/apps/non-daw.png deleted file mode 100644 index cf5ce2f..0000000 Binary files a/timeline/icons/hicolor/48x48/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/48x48/apps/non-timeline.png b/timeline/icons/hicolor/48x48/apps/non-timeline.png new file mode 100644 index 0000000..07a6584 Binary files /dev/null and b/timeline/icons/hicolor/48x48/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/512x512/apps/non-daw.png b/timeline/icons/hicolor/512x512/apps/non-daw.png deleted file mode 100644 index b1d643c..0000000 Binary files a/timeline/icons/hicolor/512x512/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/512x512/apps/non-timeline.png b/timeline/icons/hicolor/512x512/apps/non-timeline.png new file mode 100644 index 0000000..b40ff40 Binary files /dev/null and b/timeline/icons/hicolor/512x512/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/64x64/apps/non-daw.png b/timeline/icons/hicolor/64x64/apps/non-daw.png deleted file mode 100644 index 493654a..0000000 Binary files a/timeline/icons/hicolor/64x64/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/64x64/apps/non-timeline.png b/timeline/icons/hicolor/64x64/apps/non-timeline.png new file mode 100644 index 0000000..b5bfc31 Binary files /dev/null and b/timeline/icons/hicolor/64x64/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/72x72/apps/non-daw.png b/timeline/icons/hicolor/72x72/apps/non-daw.png deleted file mode 100644 index 7b851fc..0000000 Binary files a/timeline/icons/hicolor/72x72/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/72x72/apps/non-timeline.png b/timeline/icons/hicolor/72x72/apps/non-timeline.png new file mode 100644 index 0000000..214f366 Binary files /dev/null and b/timeline/icons/hicolor/72x72/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/96x96/apps/non-daw.png b/timeline/icons/hicolor/96x96/apps/non-daw.png deleted file mode 100644 index c260419..0000000 Binary files a/timeline/icons/hicolor/96x96/apps/non-daw.png and /dev/null differ diff --git a/timeline/icons/hicolor/96x96/apps/non-timeline.png b/timeline/icons/hicolor/96x96/apps/non-timeline.png new file mode 100644 index 0000000..2854c1f Binary files /dev/null and b/timeline/icons/hicolor/96x96/apps/non-timeline.png differ diff --git a/timeline/icons/hicolor/scalable/apps/non-daw.svg b/timeline/icons/hicolor/scalable/apps/non-timeline.svg similarity index 100% rename from timeline/icons/hicolor/scalable/apps/non-daw.svg rename to timeline/icons/hicolor/scalable/apps/non-timeline.svg diff --git a/timeline/src/Project.C b/timeline/src/Project.C index 92ef265..770e707 100644 --- a/timeline/src/Project.C +++ b/timeline/src/Project.C @@ -290,7 +290,9 @@ Project::open ( const char *name ) if ( ! read_info( &version, &rate, &creation_date, &created_by ) ) return E_INVALID; - if ( strncmp( created_by, APP_TITLE, strlen( APP_TITLE ) ) && + if ( strncmp( created_by, "The Non-DAW", strlen( "The Non-DAW" ) ) && + strncmp( created_by, "Non-DAW", strlen( "Non-DAW" ) ) && + strncmp( created_by, APP_TITLE, strlen( APP_TITLE ) ) && strncmp( created_by, APP_NAME, strlen( APP_NAME ) ) ) return E_INVALID; diff --git a/timeline/src/TLE.fl b/timeline/src/TLE.fl index 6efd3ed..35dd287 100644 --- a/timeline/src/TLE.fl +++ b/timeline/src/TLE.fl @@ -246,7 +246,7 @@ Loggable::progress_callback( &TLE::progress_cb, this );} {} Function {make_window()} {open } { Fl_Window main_window { - label {Non DAW : Timeline} + label {Non Timeline} callback {if ( Fl::event_key() != FL_Escape ) timeline->command_quit();} open xywh {516 306 1025 770} type Double resizable @@ -623,16 +623,16 @@ timeline->redraw();} } MenuItem {} { label {&About} - callback {About_Dialog ab( PIXMAP_PATH "/non-daw/icon-256x256.png" ); + callback {About_Dialog ab( PIXMAP_PATH "/non-timeline/icon-256x256.png" ); ab.logo_box->label( VERSION ); - ab.title->label( "The Non DAW (Digital Audio Workstation)" ); + ab.title->label( "Non Timeline" ); ab.copyright->label( "Copyright (C) 2008-2010 Jonathan Moore Liles" ); - ab.credits->label( "Non-DAW was written from scratch by\\nJonathan Moore Liles for his own use\\n(see the manual).\\n\\nNobody planned. Nobody helped.\\nYou can help now by donating time, money,\\nand/or replacing the rest of Linux Audio\\nwith fast, light, reliable alternatives.\\n" ); + ab.credits->label( "Non Timeline was written from scratch by\\nJonathan Moore Liles for his own use\\n(see the manual).\\n\\nNobody planned. Nobody helped.\\nYou can help now by donating time, money,\\nand/or replacing the rest of Linux Audio\\nwith fast, light, reliable alternatives.\\n" ); - ab.website_url->label( "http://non-daw.tuxfamily.org" ); + ab.website_url->label( "http://non.tuxfamily.org" ); ab.run();} @@ -964,7 +964,7 @@ if ( p != oldp ) } { code {char pat[256]; -snprintf( pat, 256, "file://%s/non-daw/%s.html", DOCUMENT_PATH, file ); +snprintf( pat, 256, "file://%s/non-timeline/%s.html", DOCUMENT_PATH, file ); open_url( pat );} {} } @@ -1036,7 +1036,7 @@ if ( logo_box->image() ) Fl_Box logo_box { label {} private xywh {20 173 485 268} color 53 labelfont 1 labelsize 18 align 16 - code0 {o->image( Fl_Shared_Image::get( PIXMAP_PATH "non-daw/icon-256x256.png" ) );} + code0 {o->image( Fl_Shared_Image::get( PIXMAP_PATH "non-timeline/icon-256x256.png" ) );} code1 {o->label( NULL );} } Fl_Text_Editor notes_field { diff --git a/timeline/src/main.C b/timeline/src/main.C index f3dd40a..5223084 100644 --- a/timeline/src/main.C +++ b/timeline/src/main.C @@ -71,9 +71,9 @@ char *instance_name = NULL; /* 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"; -const char COPYRIGHT[] = "Copyright (C) 2008-2012 Jonathan Moore Liles"; +const char APP_NAME[] = "Non-Timeline"; +const char APP_TITLE[] = "The Non-Timeline"; +const char COPYRIGHT[] = "Copyright (C) 2008-2013 Jonathan Moore Liles"; const double NSM_CHECK_INTERVAL = 0.25f; diff --git a/timeline/wscript b/timeline/wscript index f361c65..5684e0e 100644 --- a/timeline/wscript +++ b/timeline/wscript @@ -8,7 +8,7 @@ import os; PACKAGE_VERSION = '1.2.0' # Variables for 'waf dist' -APPNAME = 'non-daw' +APPNAME = 'non-timeline' VERSION = PACKAGE_VERSION # Mandatory variables @@ -89,7 +89,7 @@ src/Transport.C src/Waveform.C src/main.C ''', - target = 'non-daw', + target = 'non-timeline', includes = ['.', 'src', '../FL', '../nonlib'], uselib = [ 'JACK', 'LIBLO', 'SNDFILE', 'XPM', 'NTK', 'NTK_IMAGES', 'PTHREAD'], use = [ 'fl_widgets', 'nonlib'], @@ -102,6 +102,8 @@ src/main.C install_path = "${DATADIR}" + '/applications', BIN_PATH = bld.env.BINDIR ) + bld.symlink_as( '${BINDIR}/' + 'non-daw', APPNAME ) + start_dir = bld.path.find_dir( 'icons/hicolor' ) bld.install_files('${DATADIR}/icons/hicolor', start_dir.ant_glob('**/*.png'),