Massively reoganize tree.

Makefile

@@ -17,134 +17,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
 ###############################################################################
 
-## Makefile for the Non-DAW.
+SUBDIRS=timeline mixer
 
-##
-## Do not edit this file; run `make config` instead.
-##
+all:
+	@ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir; done
 
-VERSION := 0.5.0
+clean:
+	@ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir clean; done
 
-all: .config
-
-.config: configure
-	@ ./configure
-
-config:
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
+install:
+	@ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir install; done
 
 
-ifeq ($(USE_UNOPTIMIZED_DRAWING),yes)
-	CFLAGS+=-DUSE_UNOPTIMIZED_DRAWING
-endif
-
-ifeq ($(USE_SINGLEBUFFERED_TIMELINE),yes)
-	CFLAGS+=-DUSE_SINGLEBUFFERED_TIMELINE
-endif
-
-ifeq ($(USE_WIDGET_FOR_TIMELINE),yes)
-	CFLAGS+=-DUSE_WIDGET_FOR_TIMELINE
-endif
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) Compiling: $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include FL/makefile.inc
-include nonlib/makefile.inc
-include Timeline/makefile.inc
-include Mixer/makefile.inc
-
-SRCS:=$(FL_SRCS) $(nonlib_SRCS) $(Timeline_SRCS) $(Mixer_SRCS)
-OBJS:=$(FL_OBJS) $(nonlib_OBJS) $(Timeline_OBJS) $(Mixer_OBJS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-
-install: all
-	@ echo -n "Installing..."
-	@ install Timeline/timeline $(prefix)/bin/non-daw
-	@ install Mixer/mixer $(prefix)/bin/non-mixer
-	@ mkdir -p $(SYSTEM_PATH)/non-daw
-	@ mkdir -p $(PIXMAP_PATH)/non-daw
-	@ mkdir -p $(SYSTEM_PATH)/non-mixer
-	@ mkdir -p $(PIXMAP_PATH)/non-mixer
-	@ cp pixmaps/non-mixer/*.png $(PIXMAP_PATH)/non-mixer
-	@ cp pixmaps/non-daw/*.png $(PIXMAP_PATH)/non-daw
-	@ $(MAKE) -s -C doc install
-	@ echo "$(DONE)"
-ifneq ($(USE_DEBUG),yes)
-	@ echo -n "Stripping..."
-	@ strip $(prefix)/bin/non-daw
-	@ strip $(prefix)/bin/non-mixer
-	@ echo "$(DONE)"
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-.PHONEY: clean config depend clean_deps
-
-clean: FL_clean nonlib_clean Timeline_clean Mixer_clean
-
-dist:
-	git archive --prefix=non-daw-$(VERSION)/ v$(VERSION) | bzip2 > non-daw-$(VERSION).tar.bz2
-
-scan-gpl:
-	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
-
--include .deps

doc/non-mixer/mup.css

@@ -1,449 +0,0 @@
-
-/* Example CSS Style for MUP */
-
-a:link {
-    color: yellow;
-}
-a:visited {
-    color: olive;
-}
-a:active {
-    color: white;
-}
-a:link:hover {
-    text-decoration: underline;
-}
-
-/* #(url) */
-a.ext:link {
-    color: red;
-    text-decoration: none;
-    border-bottom: dashed silver 1;
-}
-a.ext:visited {
-    color: darkred;
-    border-bottom: dashed silver 1;
-    text-decoration: none;
-}
-
-/* #(ref) */
-a.int:link {
-    border-bottom: dashed silver 0.15em;
-}
-a.int:link:hover {
-    text-decoration: none;
-    color: white;
-}
-
-/*
-  a[href^="#"]:link {
-  border-bottom: dashed silver 0.15em;
-  }
-  a[href^="#"]:link:hover {
-  text-decoration: none;
-  color: white;
-  }
-  */
-
-p:contains("Warning:") {
-    background: #d00;
-    color: white;
-    border: dotted gray 0.5em;
-    display: block;
-}
-
-/* First letter of first paragraph of every chapter */
-/*
-  h1 + p:first-letter {
-  text-transform: uppercase;
-  float: left;
-  line-height: 0.8em;
-  font-size: 350%;
-  font-family: Serif;
-  letter-spacing: 0;
-  margin-right: 0.1em;
-  margin-top: 0.1em;
-  border: solid gray 1px;
-  padding: 1px;
-  color: #d00;
-  text-shadow: #666 3px 3px 3px;
-  }
-  */
-/* First paragraph of every chapter */
-/*
-  h1 + p {
-  text-indent: 0;
-  }
-  */
-
-/* cover */
-#cover * {
-    background: transparent;
-}
-#cover {
-    position: relative;
-    background: #da0;
-    color: black;
-    text-align: center;
-    margin: 0;
-    padding: 0.5em;
-}
-#cover h1, #cover h3 {
-    text-shadow: #444 0.2em 0.2em 0.2em;
-    color: white;
-    border: none;
-    letter-spacing: 0.2em;
-    line-height: 0.8em;
-    margin-left: 2em;
-    margin-right: 2em;
-}
-#cover h1:before, #cover h1:after {
-    content: "::";
-    font-size: 300%;
-    color: black;
-}
-#cover h1:before {
-    position: absolute;
-    top: 0.2em;
-    left: 0.1em;
-}
-#cover h1:after {
-    position: absolute;
-    top: 0.2em;
-    right: 0.1em;
-}
-#cover hr {
-    display: none;
-}
-
-hr:first-child {
-    display: none;
-}
-
-hr {
-    height: 0.2em;
-    background: #555;
-    color: #555;
-    margin-left: 0.5em;
-}
-
-#cover a:visited {
-    color: black;
-}
-
-/* endnote */
-#endnote {
-    color: black;
-}
-
-/* TOC */
-#toc {
-    position: relative;
-}
-#toc hr {
-}
-#toc h1 {
-}
-#toc ul {
-    font-size: 125%;
-    font-weight: bold;
-    margin-bottom: 1em;
-}
-#toc ul ul {
-    font-size: 90%;
-    font-weight: normal;
-    margin-bottom: 0;
-}
-#toc li {
-    list-style: none;
-
-}
-#toc a:link {
-    border-bottom: 0;
-}
-
-body {
-    margin: 0;
-    background: #222;
-    color: white;
-    font-family: Arial, sans-serif;
-}
-/*  */
-#body {
-    position: relative;
-    margin: 0.5em;
-    padding: 0.5em;
-}
-/* ;, : */
-h1 {
-    color: #ff0;
-    border-bottom: solid #444 0.1em;
-}
-/* ::, :::, ::::, :::::, :::::: */
-h2, h3, h4, h5, h6 {
-    color: #dd0;
-}
-
-/* tables, figures */
-.fig caption {
-    color: gray;
-    text-align: center;
-    /* Required for Mozilla */
-    margin: auto;
-}
-.fig table {
-    border: none;
-    margin: auto;
-/*	border-collapse: collapse; */
-}
-/* / */
-.fig.table th {
-    border: none;
-    background: gray;
-    color: black;
-}
-/* [ */
-.fig.table td {
-    border: none;
-    background: silver;
-    color: black;
-    padding-left: 1em;
-    padding-right: 1em;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
-}
-/* < */
-
-.fig.image table {
-    border: dashed silver 0.2em;
-    background: transparent;
-    /* Every browser should support border radii */
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-
-}
-.fig.image tr, .fig.image td {
-    border: none;
-    background: transparent;
-    padding: 0;
-}
-
-/*  */
-p {
-    margin-right: 2%;
-    text-align: justify;
-    text-indent: 1em;
-}
-/* > */
-.example *
-{
-    background: transparent;
-}
-.example table
-{
-    margin: 0;
-    padding: 0;
-    table-layout: fixed;
-    width: 100%;
-    caption-side: top;
-    overflow: auto;
-}
-.example caption
-{
-    caption-side: top;
-
-}
-.example {
-}
-.example p {
-    display: inline;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-}
-.example pre {
-    margin-top: 0;
-    font-family: Monospace;
-    padding: 1em;
-    border: dashed 0.3em gray;
-    background: #111;
-    color: white;
-    display: block;
-    overflow: auto;
-    /* Every browser should support border radii */
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-}
-/* " */
-/*
-  .quote:before {
-  float: left;
-  font-size: 500%;
-  content: "\201C";
-  }
-  */
-/*
-  blockquote:after {
-  content: "\201D";
-  }*/
-.quote blockquote {
-    padding: 0.5em;
-    margin-left: 0.5em;
-    font-family: Serif;
-    border-left: solid 0.4em gray;
-    /*	background: #333;  */
-    color: white;
-}
-/* ^ */
-small {
-/*
-  color: silver;
-  font-size: 50%;
-  */
-}
-.footnote p {
-    color: silver;
-    margin: 0;
-}
-
-/* Popup footnotes */
-.footnote p {
-    display: none;
-}
-.footnote p:target {
-    display: block;
-    overflow: auto;
-    position: fixed;
-    left: auto;
-    bottom: 0;
-    right: 0;
-    max-width: 50%;
-    border: solid 0.3em white;
-    -moz-border-radius: 0.5em;
-    background: black;
-    padding: 0.2em;
-}
-
-/* { */
-.admonition * {
-    background: transparent;
-    color: white;
-}
-.admonition dl
-{
-    display: table;
-    margin: 0;
-    padding: 0;
-    background: #333;
-    border: dotted black 0.3em;
-    width: 90%
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-}
-.admonition dt
-{
-    display: table-cell;
-    vertical-align: center;
-    border-right: solid silver 0.4em;
-    font-weight: bold;
-    font-size: 115%;
-    font-family: Serif;
-    background: gray;
-    width: 0;
-    text-shadow: black 0.15em 0.15em 0.15em;
-}
-.admonition dd
-{
-    padding-left: 0.4em;
-    display: table-cell;
-    width: 100%;
-    text-align: justify;
-}
-
-.admonition table
-{
-    margin: 0;
-    padding: 0;
-    background: #333;
-    border: dotted black 0.3em;
-    width: 90%
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-}
-.admonition td {
-    width: 100%;
-    text-align: justify;
-}
-.admonition td:first-child:contains("Warning:") {
-    background: #900;
-}
-.admonition td:first-child:contains("Caution:") {
-    background: #960;
-}
-.admonition td:first-child:contains("Note:") {
-    background: #690;
-}
-.admonition td:first-child {
-    border-right: solid silver 0.4em;
-    font-weight: bold;
-    font-size: 115%;
-    font-family: Serif;
-    background: gray;
-    width: 0;
-    text-shadow: black 0.15em 0.15em 0.15em;
-}
-
-
-/* #(b) */
-/* b { color: olive; } */
-/* #(c) */
-tt {
-    color: #7f0;
-}
-/* ! keywords ... */
-p em {
-    color: gray;
-    font-style: normal;
-    font-weight: bold;
-}
-
-/* *, + */
-/* Bullet, numbe */
-li {
-    color: #f0f;
-}
-/* Text */
-li span, li p {
-    color: white;
-}
-li p {
-    color: red;
-    display: block;
-}
-ul {
-    list-style-type: square;
-}
-dl {
-    margin-left: 2%;
-    margin-top: 1em;
-}
-/* = */
-dt {
-    background: #181818;
-    padding: 0.2em;
-    font-variant: small-caps;
-    font-weight: bold;
-    color: #f0f;
-}
-dd {
-    color: white;
-    text-align: justify;
-    margin-right: 5%;
-}
-dt a:link, dt a:visited {
-    color: #f0f;
-}
-dt a:link:hover {
-    color: silver;
-    text-decoration: underline;
-}

mixer/FL

@@ -0,0 +1 @@
+../FL

mixer/Makefile

@@ -0,0 +1,132 @@
+
+###############################################################################
+# 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.  #
+###############################################################################
+
+## Makefile for the Non-DAW.
+
+##
+## Do not edit this file; run `make config` instead.
+##
+
+VERSION := 0.5.0
+
+all: .config
+
+.config: configure
+	@ ./configure
+
+config:
+	@ ./configure
+
+-include .config
+
+export SYSTEM_PATH:=$(prefix)/share/
+export DOCUMENT_PATH:=$(prefix)/share/doc/
+export PIXMAP_PATH:=$(prefix)/share/pixmaps/
+
+# a bit of a hack to make sure this runs before any rules
+ifneq ($(CALCULATING),yes)
+TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
+endif
+
+ifeq ($(USE_DEBUG),yes)
+	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
+	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
+else
+	CFLAGS := -pipe -O2 -DNDEBUG
+	CXXFLAGS := -fno-rtti -fno-exceptions
+endif
+
+
+CFLAGS+=-DVERSION=\"$(VERSION)\" \
+	-DINSTALL_PREFIX=\"$(prefix)\" \
+	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
+	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
+	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
+
+CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
+CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
+
+INCLUDES := -I. -Iutil -IFL -Inonlib
+
+include scripts/colors
+
+ifneq ($(CALCULATING),yes)
+	COMPILING="$(BOLD)$(BLACK)[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) Compiling: $(BOLD)$(YELLOW)$<$(SGR0)"
+else
+	COMPILING="Compiling: $<"
+endif
+
+.C.o:
+	@ echo $(COMPILING)
+	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
+
+%.C : %.fl
+	@ cd `dirname $<` && fluid -c ../$<
+
+DONE := $(BOLD)$(GREEN)done$(SGR0)
+
+include FL/makefile.inc
+include nonlib/makefile.inc
+include makefile.inc
+
+SRCS:=$(FL_SRCS) $(nonlib_SRCS) $(Mixer_SRCS)
+OBJS:=$(FL_OBJS) $(nonlib_OBJS) $(Mixer_OBJS)
+
+# FIXME: isn't there a better way?
+$(OBJS): .config Makefile
+
+TAGS: $(SRCS)
+	etags $(SRCS)
+
+.deps: .config $(SRCS)
+ifneq ($(CALCULATING),yes)
+	@ echo -n Calculating dependencies...
+	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
+	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
+endif
+
+
+install: all
+	@ echo -n "Installing..."
+	@ install src/mixer $(prefix)/bin/non-mixer
+	@ mkdir -p $(SYSTEM_PATH)/non-mixer
+	@ mkdir -p $(PIXMAP_PATH)/non-mixer
+	@ cp pixmaps/*.png $(PIXMAP_PATH)/non-mixer
+	@ $(MAKE) -s -C doc install
+	@ echo "$(DONE)"
+ifneq ($(USE_DEBUG),yes)
+	@ echo -n "Stripping..."
+	@ strip $(prefix)/bin/non-mixer
+	@ echo "$(DONE)"
+endif
+
+clean_deps:
+	@ rm -f .deps
+
+.PHONEY: clean config depend clean_deps
+
+clean: FL_clean nonlib_clean Mixer_clean 
+
+dist:
+	git archive --prefix=non-mixer-$(VERSION)/ v$(VERSION) | bzip2 > non-mixer-$(VERSION).tar.bz2
+
+scan-gpl:
+	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
+
+-include .deps

mixer/configure

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Copyright (C) 2008 Jonathan Moore Liles
+# This file is licensed under version 2 of the GPL.
+
+. scripts/config-funcs
+
+begin
+
+begin_options
+
+ask "Installation prefix" prefix /usr/local
+ask "Build for debugging" USE_DEBUG no
+
+begin_tests
+
+require_FLTK 1.1.7 images
+require_command FLUID fluid
+require_command ar ar
+require_command makedepend makedepend
+require_package JACK 0.103.0 jack
+require_package lrdf 0.4.0 lrdf
+
+end

mixer/doc/Makefile

@@ -0,0 +1,25 @@
+
+SRCS=$(wildcard *.mu)
+
+OBJS=$(SRCS:.mu=.html)
+
+%.html: %.mu
+	@ echo Mupping $<...
+	@ mup.wrapper html $<
+
+.PHONY: all clean
+
+all: $(OBJS)
+
+upload: all
+	@ ln -sf OVERVIEW.html index.html
+	@ rsync -L mup.css MANUAL.html index.html *.png ssh.tuxfamily.org:/home/non/non-mixer.tuxfamily.org-web/htdocs
+	@ rm -f index.html
+
+install:
+	@ mkdir -p $(DOCUMENT_PATH)/non-mixer
+	@ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-mixer
+#	@ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
+
+clean:
+	rm -f $(OBJS)

mixer/makefile.inc

@@ -2,20 +2,19 @@
 
 all: Mixer
 
-Mixer_SRCS := $(wildcard Mixer/*.C Mixer/*.fl Mixer/Engine/*.C)
-Mixer_SRCS += util/debug.C util/Thread.C util/file.C
+Mixer_SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
 
 Mixer_SRCS:=$(Mixer_SRCS:.fl=.C)
 Mixer_SRCS:=$(sort $(Mixer_SRCS))
 Mixer_OBJS:=$(Mixer_SRCS:.C=.o)
 
-Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) -llrdf
+Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS)
 
-Mixer/mixer: $(Mixer_OBJS) FL nonlib
+src/mixer: $(Mixer_OBJS) FL nonlib
 	@ echo -n Linking mixer...
 	@ $(CXX) $(CXXFLAGS) $(Mixer_LIBS) $(Mixer_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE)
 
-Mixer: Mixer/mixer
+Mixer: src/mixer
 
 Mixer_clean:
-	rm -f $(Mixer_OBJS) Mixer/mixer
+	rm -f $(Mixer_OBJS) src/mixer

mixer/nonlib

@@ -0,0 +1 @@
+../nonlib

mixer/scripts

@@ -0,0 +1 @@
+../scripts/

mixer/src/Chain.C

@@ -71,7 +71,7 @@
 #include "FL/menu_popup.H"
 #include "FL/test_press.H"
 
-#include "util/debug.h"
+#include "debug.h"
 #include "Engine/Engine.H"
 
 #include "Mixer_Strip.H"

mixer/src/Engine/Engine.C

@@ -25,8 +25,8 @@
 /* This is the home of the JACK process callback */
 
 // #include "const.h"
-#include "util/debug.h"
-#include "util/Thread.H"
+#include "debug.h"
+#include "Thread.H"
 
 
 

mixer/src/Engine/Engine.H

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "util/Mutex.H"
+#include "Mutex.H"
 
 class Port;
 

mixer/src/Mixer.C

@@ -36,7 +36,7 @@
 #include "FL/Fl_Menu_Settings.H"
 #include "About_Dialog.H"
 
-#include "util/file.h"
+#include "file.h"
 
 #include <string.h>
 #include "debug.h"
@@ -47,7 +47,7 @@ const double STATUS_UPDATE_FREQ = 0.2f;
 
 extern char *user_config_dir;
 
-#include "util/debug.h"
+#include "debug.h"
 
 static void update_cb( void *v ) {
     Fl::repeat_timeout( STATUS_UPDATE_FREQ, update_cb, v );

mixer/src/Mixer_Strip.C

@@ -51,7 +51,7 @@
 #include "Meter_Module.H"
 #include "Controller_Module.H"
 #include "Meter_Indicator_Module.H"
-#include "util/debug.h"
+#include "debug.h"
 
 #include <FL/Fl_Menu_Button.H>
 #include "FL/test_press.H"

mixer/src/Module.H

@@ -23,10 +23,10 @@
 #include <FL/Fl_Group.H>
 
 #include <stdlib.h>
-#include "util/debug.h"
+#include "debug.h"
 #include <vector>
 
-#include "util/Thread.H"
+#include "Thread.H"
 
 #include "Loggable.H"
 #include "JACK/Port.H"

mixer/src/Module_Parameter_Editor.C

@@ -38,7 +38,7 @@
 #include "Controller_Module.H"
 #include "Chain.H"
 
-#include <util/debug.h>
+#include "debug.h"
 
 
 

mixer/src/Plugin_Module.C

@@ -35,7 +35,7 @@
 
 #include "Plugin_Module.H"
 
-#include "util/debug.h"
+#include "debug.h"
 
 #define HAVE_LIBLRDF 1
 #include "LADSPAInfo.h"

mixer/src/Project.C

@@ -36,8 +36,8 @@
 #include <FL/filename.H>
 
 #include "const.h"
-#include "util/debug.h"
-#include "util/file.h"
+#include "debug.h"
+#include "file.h"
 
 #include "Mixer.H"
 

mixer/src/main.C

@@ -32,8 +32,8 @@
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Pack.H>
 #include <FL/Boxtypes.H>
-#include "util/Thread.H"
-#include "util/debug.h"
+#include "Thread.H"
+#include "debug.h"
 
 #include "Mixer.H"
 #include "Project.H"

nonlib/Log_Entry.C

@@ -20,7 +20,7 @@
 #include "Log_Entry.H"
 
 // #include "const.h"
-#include "util/debug.h"
+#include "debug.h"
 
 Log_Entry::Log_Entry ( )
 {

nonlib/Loggable.C

@@ -31,10 +31,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util/file.h"
+#include "file.h"
 
 // #include "const.h"
-#include "util/debug.h"
+#include "debug.h"
 
 #include <algorithm>
 using std::min;

nonlib/makefile.inc

@@ -1,6 +1,6 @@
 # -*- mode: makefile; -*-
 
-nonlib_SRCS := $(wildcard nonlib/*.C nonlib/JACK/*.C nonlib/LASH/*.C)
+nonlib_SRCS := $(wildcard nonlib/*.C nonlib/*.c nonlib/JACK/*.C nonlib/LASH/*.C)
 
 nonlib_SRCS:=$(sort $(nonlib_SRCS))
 nonlib_OBJS:=$(nonlib_SRCS:.C=.o)

pixmaps/Makefile

@@ -1,6 +0,0 @@
-
-%.png : %.svg
-	convert -background none $< -scale 256 -colors 256 -quality 0 $@
-
-all: logo.png logo2.png
-

timeline/FL

@@ -0,0 +1 @@
+../FL

timeline/Makefile

@@ -0,0 +1,144 @@
+
+###############################################################################
+# 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.  #
+###############################################################################
+
+## Makefile for the Non-DAW.
+
+##
+## Do not edit this file; run `make config` instead.
+##
+
+VERSION := 0.5.0
+
+all: .config
+
+.config: configure
+	@ ./configure
+
+config:
+	@ ./configure
+
+-include .config
+
+export SYSTEM_PATH:=$(prefix)/share/
+export DOCUMENT_PATH:=$(prefix)/share/doc/
+export PIXMAP_PATH:=$(prefix)/share/pixmaps/
+
+# a bit of a hack to make sure this runs before any rules
+ifneq ($(CALCULATING),yes)
+TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
+endif
+
+ifeq ($(USE_DEBUG),yes)
+	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
+	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
+else
+	CFLAGS := -pipe -O2 -DNDEBUG
+	CXXFLAGS := -fno-rtti -fno-exceptions
+endif
+
+
+ifeq ($(USE_UNOPTIMIZED_DRAWING),yes)
+	CFLAGS+=-DUSE_UNOPTIMIZED_DRAWING
+endif
+
+ifeq ($(USE_SINGLEBUFFERED_TIMELINE),yes)
+	CFLAGS+=-DUSE_SINGLEBUFFERED_TIMELINE
+endif
+
+ifeq ($(USE_WIDGET_FOR_TIMELINE),yes)
+	CFLAGS+=-DUSE_WIDGET_FOR_TIMELINE
+endif
+
+CFLAGS+=-DVERSION=\"$(VERSION)\" \
+	-DINSTALL_PREFIX=\"$(prefix)\" \
+	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
+	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
+	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
+
+CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
+CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
+
+INCLUDES := -I. -Iutil -IFL -Inonlib
+
+include scripts/colors
+
+ifneq ($(CALCULATING),yes)
+	COMPILING="$(BOLD)$(BLACK)[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) Compiling: $(BOLD)$(YELLOW)$<$(SGR0)"
+else
+	COMPILING="Compiling: $<"
+endif
+
+.C.o:
+	@ echo $(COMPILING)
+	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
+
+%.C : %.fl
+	@ cd `dirname $<` && fluid -c ../$<
+
+DONE := $(BOLD)$(GREEN)done$(SGR0)
+
+include FL/makefile.inc
+include nonlib/makefile.inc
+include makefile.inc
+
+SRCS:=$(FL_SRCS) $(nonlib_SRCS) $(Timeline_SRCS) $(Mixer_SRCS)
+OBJS:=$(FL_OBJS) $(nonlib_OBJS) $(Timeline_OBJS) $(Mixer_OBJS)
+
+# FIXME: isn't there a better way?
+$(OBJS): .config Makefile
+
+TAGS: $(SRCS)
+	etags $(SRCS)
+
+.deps: .config $(SRCS)
+ifneq ($(CALCULATING),yes)
+	@ echo -n Calculating dependencies...
+	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
+	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
+endif
+
+
+install: all
+	@ echo -n "Installing..."
+	@ install src/timeline $(prefix)/bin/non-daw
+	@ mkdir -p $(SYSTEM_PATH)/non-daw
+	@ mkdir -p $(PIXMAP_PATH)/non-daw
+	@ cp pixmaps/*.png $(PIXMAP_PATH)/non-daw
+	@ $(MAKE) -s -C doc install
+	@ echo "$(DONE)"
+ifneq ($(USE_DEBUG),yes)
+	@ echo -n "Stripping..."
+	@ strip $(prefix)/bin/non-daw
+	@ echo "$(DONE)"
+endif
+
+clean_deps:
+	@ rm -f .deps
+
+.PHONEY: clean config depend clean_deps
+
+clean: FL_clean nonlib_clean Timeline_clean
+
+dist:
+	git archive --prefix=non-daw-$(VERSION)/ v$(VERSION) | bzip2 > non-daw-$(VERSION).tar.bz2
+
+scan-gpl:
+	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
+
+-include .deps

timeline/configure

@@ -27,6 +27,5 @@ require_command ar ar
 require_command makedepend makedepend
 require_package JACK 0.103.0 jack
 require_package sndfile 1.0.17 sndfile
-require_package lrdf 0.1.0 lrdf
 
 end

timeline/doc/Makefile

@@ -1,11 +1,7 @@
 
-NM_SRCS=$(wildcard non-mixer/*.mu)
 SRCS=$(wildcard *.mu)
-ND_SRCS=$(wildcard non-daw/*.mu)
 
 OBJS=$(SRCS:.mu=.html)
-NM_OBJS=$(NM_SRCS:.mu=.html)
-ND_OBJS=$(ND_SRCS:.mu=.html)
 
 %.html: %.mu
 	@ echo Mupping $<...
@@ -13,7 +9,7 @@ ND_OBJS=$(ND_SRCS:.mu=.html)
 
 .PHONY: all clean
 
-all: $(OBJS) $(NM_OBJS) $(ND_OBJS)
+all: $(OBJS)
 
 upload: all
 	@ ln -sf OVERVIEW.html index.html
@@ -22,10 +18,8 @@ upload: all
 
 install:
 	@ mkdir -p $(DOCUMENT_PATH)/non-daw
-	@ mkdir -p $(DOCUMENT_PATH)/non-mixer
-	@ cp $(ND_OBJS) non-daw/*.png non-daw/mup.css ../COPYING $(DOCUMENT_PATH)/non-daw
-	@ cp $(NM_OBJS) non-mixer/*.png non-mixer/mup.css ../COPYING $(DOCUMENT_PATH)/non-mixer
+	@ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-daw
 #	@ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
 
 clean:
-	rm -f $(OBJS) $(NM_OBJS) $(ND_OBJS)
+	rm -f $(OBJS)

timeline/makefile.inc

@@ -4,9 +4,7 @@ all: Timeline
 
 Timeline_VERSION := 0.5.0
 
-Timeline_SRCS := $(wildcard Timeline/*.C Timeline/*.fl Timeline/Engine/*.C)
-
-Timeline_SRCS += util/debug.C util/Thread.C util/file.C
+Timeline_SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
 
 Timeline_SRCS:=$(Timeline_SRCS:.fl=.C)
 Timeline_SRCS:=$(sort $(Timeline_SRCS))
@@ -14,11 +12,11 @@ Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
 
 Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS)
 
-Timeline/timeline: $(Timeline_OBJS) FL
+src/timeline: $(Timeline_OBJS) FL
 	@ echo -n Linking timeline...
 	@ $(CXX) $(CXXFLAGS) $(INCLUDES) $(Timeline_LIBS)  $(Timeline_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE)
 
-Timeline: Timeline/timeline
+Timeline: src/timeline
 
 Timeline_clean:
 	rm -f $(Timeline_OBJS) Timeline/timeline

timeline/nonlib

@@ -0,0 +1 @@
+../nonlib