diff --git a/Makefile b/Makefile index 75a8f61..8e93ca3 100644 --- a/Makefile +++ b/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 diff --git a/doc/non-mixer/mup.css b/doc/non-mixer/mup.css deleted file mode 100644 index fd4229a..0000000 --- a/doc/non-mixer/mup.css +++ /dev/null @@ -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; -} diff --git a/mixer/FL b/mixer/FL new file mode 120000 index 0000000..d025fc7 --- /dev/null +++ b/mixer/FL @@ -0,0 +1 @@ +../FL \ No newline at end of file diff --git a/mixer/Makefile b/mixer/Makefile new file mode 100644 index 0000000..6a032a4 --- /dev/null +++ b/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 diff --git a/mixer/configure b/mixer/configure new file mode 100755 index 0000000..1f25912 --- /dev/null +++ b/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 diff --git a/doc/non-mixer/MANUAL.html b/mixer/doc/MANUAL.html similarity index 100% rename from doc/non-mixer/MANUAL.html rename to mixer/doc/MANUAL.html diff --git a/doc/non-mixer/MANUAL.mu b/mixer/doc/MANUAL.mu similarity index 100% rename from doc/non-mixer/MANUAL.mu rename to mixer/doc/MANUAL.mu diff --git a/mixer/doc/Makefile b/mixer/doc/Makefile new file mode 100644 index 0000000..b4edd91 --- /dev/null +++ b/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) diff --git a/doc/non-mixer/controls.png b/mixer/doc/controls.png similarity index 100% rename from doc/non-mixer/controls.png rename to mixer/doc/controls.png diff --git a/doc/non-mixer/gverb-parameters-hsliders.png b/mixer/doc/gverb-parameters-hsliders.png similarity index 100% rename from doc/non-mixer/gverb-parameters-hsliders.png rename to mixer/doc/gverb-parameters-hsliders.png diff --git a/doc/non-mixer/gverb-parameters-knobs.png b/mixer/doc/gverb-parameters-knobs.png similarity index 100% rename from doc/non-mixer/gverb-parameters-knobs.png rename to mixer/doc/gverb-parameters-knobs.png diff --git a/doc/non-mixer/gverb-parameters-vsliders.png b/mixer/doc/gverb-parameters-vsliders.png similarity index 100% rename from doc/non-mixer/gverb-parameters-vsliders.png rename to mixer/doc/gverb-parameters-vsliders.png diff --git a/doc/non-mixer/mixer-strips.png b/mixer/doc/mixer-strips.png similarity index 100% rename from doc/non-mixer/mixer-strips.png rename to mixer/doc/mixer-strips.png diff --git a/doc/non-mixer/modules.png b/mixer/doc/modules.png similarity index 100% rename from doc/non-mixer/modules.png rename to mixer/doc/modules.png diff --git a/doc/mup.css b/mixer/doc/mup.css similarity index 100% rename from doc/mup.css rename to mixer/doc/mup.css diff --git a/doc/non-mixer/new-project.png b/mixer/doc/new-project.png similarity index 100% rename from doc/non-mixer/new-project.png rename to mixer/doc/new-project.png diff --git a/doc/non-mixer/non-mixer-and-non-daw-in-patchage.png b/mixer/doc/non-mixer-and-non-daw-in-patchage.png similarity index 100% rename from doc/non-mixer/non-mixer-and-non-daw-in-patchage.png rename to mixer/doc/non-mixer-and-non-daw-in-patchage.png diff --git a/doc/non-mixer/non-mixer-complex.png b/mixer/doc/non-mixer-complex.png similarity index 100% rename from doc/non-mixer/non-mixer-complex.png rename to mixer/doc/non-mixer-complex.png diff --git a/doc/non-mixer/single-strip.png b/mixer/doc/single-strip.png similarity index 100% rename from doc/non-mixer/single-strip.png rename to mixer/doc/single-strip.png diff --git a/Mixer/makefile.inc b/mixer/makefile.inc similarity index 52% rename from Mixer/makefile.inc rename to mixer/makefile.inc index 7e6501f..746584d 100644 --- a/Mixer/makefile.inc +++ b/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 diff --git a/mixer/nonlib b/mixer/nonlib new file mode 120000 index 0000000..bff0245 --- /dev/null +++ b/mixer/nonlib @@ -0,0 +1 @@ +../nonlib \ No newline at end of file diff --git a/pixmaps/non-mixer/logo.png b/mixer/pixmaps/logo.png similarity index 100% rename from pixmaps/non-mixer/logo.png rename to mixer/pixmaps/logo.png diff --git a/pixmaps/non-mixer/logo.svg b/mixer/pixmaps/logo.svg similarity index 100% rename from pixmaps/non-mixer/logo.svg rename to mixer/pixmaps/logo.svg diff --git a/mixer/scripts b/mixer/scripts new file mode 120000 index 0000000..adb0a1d --- /dev/null +++ b/mixer/scripts @@ -0,0 +1 @@ +../scripts/ \ No newline at end of file diff --git a/Mixer/Chain.C b/mixer/src/Chain.C similarity index 99% rename from Mixer/Chain.C rename to mixer/src/Chain.C index fa630a0..7d8fa98 100644 --- a/Mixer/Chain.C +++ b/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" diff --git a/Mixer/Chain.H b/mixer/src/Chain.H similarity index 100% rename from Mixer/Chain.H rename to mixer/src/Chain.H diff --git a/Mixer/Controller_Module.C b/mixer/src/Controller_Module.C similarity index 100% rename from Mixer/Controller_Module.C rename to mixer/src/Controller_Module.C diff --git a/Mixer/Controller_Module.H b/mixer/src/Controller_Module.H similarity index 100% rename from Mixer/Controller_Module.H rename to mixer/src/Controller_Module.H diff --git a/Mixer/DPM.C b/mixer/src/DPM.C similarity index 100% rename from Mixer/DPM.C rename to mixer/src/DPM.C diff --git a/Mixer/DPM.H b/mixer/src/DPM.H similarity index 100% rename from Mixer/DPM.H rename to mixer/src/DPM.H diff --git a/Mixer/Engine/Engine.C b/mixer/src/Engine/Engine.C similarity index 98% rename from Mixer/Engine/Engine.C rename to mixer/src/Engine/Engine.C index 9ce1296..ced044b 100644 --- a/Mixer/Engine/Engine.C +++ b/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" diff --git a/Mixer/Engine/Engine.H b/mixer/src/Engine/Engine.H similarity index 99% rename from Mixer/Engine/Engine.H rename to mixer/src/Engine/Engine.H index a30317c..b967c19 100644 --- a/Mixer/Engine/Engine.H +++ b/mixer/src/Engine/Engine.H @@ -19,7 +19,7 @@ #pragma once -#include "util/Mutex.H" +#include "Mutex.H" class Port; diff --git a/Mixer/Gain_Module.C b/mixer/src/Gain_Module.C similarity index 100% rename from Mixer/Gain_Module.C rename to mixer/src/Gain_Module.C diff --git a/Mixer/Gain_Module.H b/mixer/src/Gain_Module.H similarity index 100% rename from Mixer/Gain_Module.H rename to mixer/src/Gain_Module.H diff --git a/Mixer/JACK_Module.C b/mixer/src/JACK_Module.C similarity index 100% rename from Mixer/JACK_Module.C rename to mixer/src/JACK_Module.C diff --git a/Mixer/JACK_Module.H b/mixer/src/JACK_Module.H similarity index 100% rename from Mixer/JACK_Module.H rename to mixer/src/JACK_Module.H diff --git a/Mixer/LADSPAInfo.C b/mixer/src/LADSPAInfo.C similarity index 100% rename from Mixer/LADSPAInfo.C rename to mixer/src/LADSPAInfo.C diff --git a/Mixer/LADSPAInfo.h b/mixer/src/LADSPAInfo.h similarity index 100% rename from Mixer/LADSPAInfo.h rename to mixer/src/LADSPAInfo.h diff --git a/Mixer/Meter.H b/mixer/src/Meter.H similarity index 100% rename from Mixer/Meter.H rename to mixer/src/Meter.H diff --git a/Mixer/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C similarity index 100% rename from Mixer/Meter_Indicator_Module.C rename to mixer/src/Meter_Indicator_Module.C diff --git a/Mixer/Meter_Indicator_Module.H b/mixer/src/Meter_Indicator_Module.H similarity index 100% rename from Mixer/Meter_Indicator_Module.H rename to mixer/src/Meter_Indicator_Module.H diff --git a/Mixer/Meter_Module.C b/mixer/src/Meter_Module.C similarity index 100% rename from Mixer/Meter_Module.C rename to mixer/src/Meter_Module.C diff --git a/Mixer/Meter_Module.H b/mixer/src/Meter_Module.H similarity index 100% rename from Mixer/Meter_Module.H rename to mixer/src/Meter_Module.H diff --git a/Mixer/Mixer.C b/mixer/src/Mixer.C similarity index 99% rename from Mixer/Mixer.C rename to mixer/src/Mixer.C index 9e9cd09..c89f364 100644 --- a/Mixer/Mixer.C +++ b/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 #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 ); diff --git a/Mixer/Mixer.H b/mixer/src/Mixer.H similarity index 100% rename from Mixer/Mixer.H rename to mixer/src/Mixer.H diff --git a/Mixer/Mixer_Strip.C b/mixer/src/Mixer_Strip.C similarity index 99% rename from Mixer/Mixer_Strip.C rename to mixer/src/Mixer_Strip.C index c8d2e5e..9be8ebe 100644 --- a/Mixer/Mixer_Strip.C +++ b/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 #include "FL/test_press.H" diff --git a/Mixer/Mixer_Strip.H b/mixer/src/Mixer_Strip.H similarity index 100% rename from Mixer/Mixer_Strip.H rename to mixer/src/Mixer_Strip.H diff --git a/Mixer/Module.C b/mixer/src/Module.C similarity index 100% rename from Mixer/Module.C rename to mixer/src/Module.C diff --git a/Mixer/Module.H b/mixer/src/Module.H similarity index 99% rename from Mixer/Module.H rename to mixer/src/Module.H index a4c443d..939410c 100644 --- a/Mixer/Module.H +++ b/mixer/src/Module.H @@ -23,10 +23,10 @@ #include #include -#include "util/debug.h" +#include "debug.h" #include -#include "util/Thread.H" +#include "Thread.H" #include "Loggable.H" #include "JACK/Port.H" diff --git a/Mixer/Module_Parameter_Editor.C b/mixer/src/Module_Parameter_Editor.C similarity index 99% rename from Mixer/Module_Parameter_Editor.C rename to mixer/src/Module_Parameter_Editor.C index 08a8b5c..b86c96d 100644 --- a/Mixer/Module_Parameter_Editor.C +++ b/mixer/src/Module_Parameter_Editor.C @@ -38,7 +38,7 @@ #include "Controller_Module.H" #include "Chain.H" -#include +#include "debug.h" diff --git a/Mixer/Module_Parameter_Editor.H b/mixer/src/Module_Parameter_Editor.H similarity index 100% rename from Mixer/Module_Parameter_Editor.H rename to mixer/src/Module_Parameter_Editor.H diff --git a/Mixer/Mono_Pan_Module.C b/mixer/src/Mono_Pan_Module.C similarity index 100% rename from Mixer/Mono_Pan_Module.C rename to mixer/src/Mono_Pan_Module.C diff --git a/Mixer/Mono_Pan_Module.H b/mixer/src/Mono_Pan_Module.H similarity index 100% rename from Mixer/Mono_Pan_Module.H rename to mixer/src/Mono_Pan_Module.H diff --git a/Mixer/Panner.C b/mixer/src/Panner.C similarity index 100% rename from Mixer/Panner.C rename to mixer/src/Panner.C diff --git a/Mixer/Panner.H b/mixer/src/Panner.H similarity index 100% rename from Mixer/Panner.H rename to mixer/src/Panner.H diff --git a/Mixer/Plugin_Module.C b/mixer/src/Plugin_Module.C similarity index 99% rename from Mixer/Plugin_Module.C rename to mixer/src/Plugin_Module.C index 8281bf8..c4f61ee 100644 --- a/Mixer/Plugin_Module.C +++ b/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" diff --git a/Mixer/Plugin_Module.H b/mixer/src/Plugin_Module.H similarity index 100% rename from Mixer/Plugin_Module.H rename to mixer/src/Plugin_Module.H diff --git a/Mixer/Project.C b/mixer/src/Project.C similarity index 99% rename from Mixer/Project.C rename to mixer/src/Project.C index 00f67d9..f82d16d 100644 --- a/Mixer/Project.C +++ b/mixer/src/Project.C @@ -36,8 +36,8 @@ #include #include "const.h" -#include "util/debug.h" -#include "util/file.h" +#include "debug.h" +#include "file.h" #include "Mixer.H" diff --git a/Mixer/Project.H b/mixer/src/Project.H similarity index 100% rename from Mixer/Project.H rename to mixer/src/Project.H diff --git a/Mixer/const.h b/mixer/src/const.h similarity index 100% rename from Mixer/const.h rename to mixer/src/const.h diff --git a/Mixer/main.C b/mixer/src/main.C similarity index 99% rename from Mixer/main.C rename to mixer/src/main.C index a43e06a..ee0c19b 100644 --- a/Mixer/main.C +++ b/mixer/src/main.C @@ -32,8 +32,8 @@ #include #include #include -#include "util/Thread.H" -#include "util/debug.h" +#include "Thread.H" +#include "debug.h" #include "Mixer.H" #include "Project.H" diff --git a/util/Block_Timer.H b/nonlib/Block_Timer.H similarity index 100% rename from util/Block_Timer.H rename to nonlib/Block_Timer.H diff --git a/nonlib/Log_Entry.C b/nonlib/Log_Entry.C index 3a0149d..ae6b6c8 100644 --- a/nonlib/Log_Entry.C +++ b/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 ( ) { diff --git a/nonlib/Loggable.C b/nonlib/Loggable.C index 508c441..b1950ad 100644 --- a/nonlib/Loggable.C +++ b/nonlib/Loggable.C @@ -31,10 +31,10 @@ #include #include -#include "util/file.h" +#include "file.h" // #include "const.h" -#include "util/debug.h" +#include "debug.h" #include using std::min; diff --git a/util/Mutex.H b/nonlib/Mutex.H similarity index 100% rename from util/Mutex.H rename to nonlib/Mutex.H diff --git a/util/Thread.C b/nonlib/Thread.C similarity index 100% rename from util/Thread.C rename to nonlib/Thread.C diff --git a/util/Thread.H b/nonlib/Thread.H similarity index 100% rename from util/Thread.H rename to nonlib/Thread.H diff --git a/util/debug.C b/nonlib/debug.C similarity index 100% rename from util/debug.C rename to nonlib/debug.C diff --git a/util/debug.h b/nonlib/debug.h similarity index 100% rename from util/debug.h rename to nonlib/debug.h diff --git a/util/file.C b/nonlib/file.C similarity index 100% rename from util/file.C rename to nonlib/file.C diff --git a/util/file.h b/nonlib/file.h similarity index 100% rename from util/file.h rename to nonlib/file.h diff --git a/nonlib/makefile.inc b/nonlib/makefile.inc index 4697f0c..5bc3f07 100644 --- a/nonlib/makefile.inc +++ b/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) diff --git a/pixmaps/Makefile b/pixmaps/Makefile deleted file mode 100644 index eef6a50..0000000 --- a/pixmaps/Makefile +++ /dev/null @@ -1,6 +0,0 @@ - -%.png : %.svg - convert -background none $< -scale 256 -colors 256 -quality 0 $@ - -all: logo.png logo2.png - diff --git a/timeline/FL b/timeline/FL new file mode 120000 index 0000000..d025fc7 --- /dev/null +++ b/timeline/FL @@ -0,0 +1 @@ +../FL \ No newline at end of file diff --git a/timeline/Makefile b/timeline/Makefile new file mode 100644 index 0000000..efffb65 --- /dev/null +++ b/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 diff --git a/configure b/timeline/configure similarity index 95% rename from configure rename to timeline/configure index 0d4c5cb..d5301cf 100755 --- a/configure +++ b/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 diff --git a/doc/non-daw/MANUAL.html b/timeline/doc/MANUAL.html similarity index 100% rename from doc/non-daw/MANUAL.html rename to timeline/doc/MANUAL.html diff --git a/doc/non-daw/MANUAL.mu b/timeline/doc/MANUAL.mu similarity index 100% rename from doc/non-daw/MANUAL.mu rename to timeline/doc/MANUAL.mu diff --git a/doc/Makefile b/timeline/doc/Makefile similarity index 50% rename from doc/Makefile rename to timeline/doc/Makefile index ac49e71..a9871d9 100644 --- a/doc/Makefile +++ b/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) diff --git a/doc/OVERVIEW.html b/timeline/doc/OVERVIEW.html similarity index 100% rename from doc/OVERVIEW.html rename to timeline/doc/OVERVIEW.html diff --git a/doc/OVERVIEW.mu b/timeline/doc/OVERVIEW.mu similarity index 100% rename from doc/OVERVIEW.mu rename to timeline/doc/OVERVIEW.mu diff --git a/doc/non-daw/annotations.png b/timeline/doc/annotations.png similarity index 100% rename from doc/non-daw/annotations.png rename to timeline/doc/annotations.png diff --git a/doc/non-daw/automation.png b/timeline/doc/automation.png similarity index 100% rename from doc/non-daw/automation.png rename to timeline/doc/automation.png diff --git a/doc/non-daw/clocks.png b/timeline/doc/clocks.png similarity index 100% rename from doc/non-daw/clocks.png rename to timeline/doc/clocks.png diff --git a/doc/non-daw/crappy-screenshot.png b/timeline/doc/crappy-screenshot.png similarity index 100% rename from doc/non-daw/crappy-screenshot.png rename to timeline/doc/crappy-screenshot.png diff --git a/doc/non-daw/fade-in-out.png b/timeline/doc/fade-in-out.png similarity index 100% rename from doc/non-daw/fade-in-out.png rename to timeline/doc/fade-in-out.png diff --git a/doc/non-daw/looping.png b/timeline/doc/looping.png similarity index 100% rename from doc/non-daw/looping.png rename to timeline/doc/looping.png diff --git a/doc/non-daw/mup.css b/timeline/doc/mup.css similarity index 100% rename from doc/non-daw/mup.css rename to timeline/doc/mup.css diff --git a/doc/non-daw/new-project.png b/timeline/doc/new-project.png similarity index 100% rename from doc/non-daw/new-project.png rename to timeline/doc/new-project.png diff --git a/doc/non-daw/project-info.png b/timeline/doc/project-info.png similarity index 100% rename from doc/non-daw/project-info.png rename to timeline/doc/project-info.png diff --git a/doc/non-daw/range.png b/timeline/doc/range.png similarity index 100% rename from doc/non-daw/range.png rename to timeline/doc/range.png diff --git a/doc/non-daw/recording.png b/timeline/doc/recording.png similarity index 100% rename from doc/non-daw/recording.png rename to timeline/doc/recording.png diff --git a/doc/non-daw/tempomap.png b/timeline/doc/tempomap.png similarity index 100% rename from doc/non-daw/tempomap.png rename to timeline/doc/tempomap.png diff --git a/doc/non-daw/tle.png b/timeline/doc/tle.png similarity index 100% rename from doc/non-daw/tle.png rename to timeline/doc/tle.png diff --git a/doc/non-daw/track-header.png b/timeline/doc/track-header.png similarity index 100% rename from doc/non-daw/track-header.png rename to timeline/doc/track-header.png diff --git a/doc/non-daw/transport.png b/timeline/doc/transport.png similarity index 100% rename from doc/non-daw/transport.png rename to timeline/doc/transport.png diff --git a/Timeline/makefile.inc b/timeline/makefile.inc similarity index 69% rename from Timeline/makefile.inc rename to timeline/makefile.inc index 90cdc54..d9eb45e 100644 --- a/Timeline/makefile.inc +++ b/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 diff --git a/timeline/nonlib b/timeline/nonlib new file mode 120000 index 0000000..bff0245 --- /dev/null +++ b/timeline/nonlib @@ -0,0 +1 @@ +../nonlib \ No newline at end of file diff --git a/pixmaps/non-daw/logo.png b/timeline/pixmaps/logo.png similarity index 100% rename from pixmaps/non-daw/logo.png rename to timeline/pixmaps/logo.png diff --git a/pixmaps/non-daw/logo.svg b/timeline/pixmaps/logo.svg similarity index 100% rename from pixmaps/non-daw/logo.svg rename to timeline/pixmaps/logo.svg diff --git a/pixmaps/non-daw/logo2.png b/timeline/pixmaps/logo2.png similarity index 100% rename from pixmaps/non-daw/logo2.png rename to timeline/pixmaps/logo2.png diff --git a/pixmaps/non-daw/logo2.svg b/timeline/pixmaps/logo2.svg similarity index 100% rename from pixmaps/non-daw/logo2.svg rename to timeline/pixmaps/logo2.svg diff --git a/timeline/scripts b/timeline/scripts new file mode 120000 index 0000000..adb0a1d --- /dev/null +++ b/timeline/scripts @@ -0,0 +1 @@ +../scripts/ \ No newline at end of file diff --git a/Timeline/Annotation_Point.H b/timeline/src/Annotation_Point.H similarity index 100% rename from Timeline/Annotation_Point.H rename to timeline/src/Annotation_Point.H diff --git a/Timeline/Annotation_Region.C b/timeline/src/Annotation_Region.C similarity index 100% rename from Timeline/Annotation_Region.C rename to timeline/src/Annotation_Region.C diff --git a/Timeline/Annotation_Region.H b/timeline/src/Annotation_Region.H similarity index 100% rename from Timeline/Annotation_Region.H rename to timeline/src/Annotation_Region.H diff --git a/Timeline/Annotation_Sequence.H b/timeline/src/Annotation_Sequence.H similarity index 100% rename from Timeline/Annotation_Sequence.H rename to timeline/src/Annotation_Sequence.H diff --git a/Timeline/Audio_Region.C b/timeline/src/Audio_Region.C similarity index 99% rename from Timeline/Audio_Region.C rename to timeline/src/Audio_Region.C index 7a38de4..709f516 100644 --- a/Timeline/Audio_Region.C +++ b/timeline/src/Audio_Region.C @@ -33,7 +33,7 @@ #include "Engine/Audio_File.H" #include "const.h" -#include "util/debug.h" +#include "debug.h" #include using std::min; diff --git a/Timeline/Audio_Region.H b/timeline/src/Audio_Region.H similarity index 100% rename from Timeline/Audio_Region.H rename to timeline/src/Audio_Region.H diff --git a/Timeline/Audio_Sequence.C b/timeline/src/Audio_Sequence.C similarity index 100% rename from Timeline/Audio_Sequence.C rename to timeline/src/Audio_Sequence.C diff --git a/Timeline/Audio_Sequence.H b/timeline/src/Audio_Sequence.H similarity index 100% rename from Timeline/Audio_Sequence.H rename to timeline/src/Audio_Sequence.H diff --git a/Timeline/Clock.H b/timeline/src/Clock.H similarity index 100% rename from Timeline/Clock.H rename to timeline/src/Clock.H diff --git a/Timeline/Control_Point.C b/timeline/src/Control_Point.C similarity index 100% rename from Timeline/Control_Point.C rename to timeline/src/Control_Point.C diff --git a/Timeline/Control_Point.H b/timeline/src/Control_Point.H similarity index 100% rename from Timeline/Control_Point.H rename to timeline/src/Control_Point.H diff --git a/Timeline/Control_Sequence.C b/timeline/src/Control_Sequence.C similarity index 100% rename from Timeline/Control_Sequence.C rename to timeline/src/Control_Sequence.C diff --git a/Timeline/Control_Sequence.H b/timeline/src/Control_Sequence.H similarity index 100% rename from Timeline/Control_Sequence.H rename to timeline/src/Control_Sequence.H diff --git a/Timeline/Engine/Audio_File.C b/timeline/src/Engine/Audio_File.C similarity index 98% rename from Timeline/Engine/Audio_File.C rename to timeline/src/Engine/Audio_File.C index 4013e88..82dab02 100644 --- a/Timeline/Engine/Audio_File.C +++ b/timeline/src/Engine/Audio_File.C @@ -22,8 +22,8 @@ #include "Audio_File_Dummy.H" #include "const.h" -#include "util/debug.h" -#include "util/Block_Timer.H" +#include "debug.h" +#include "Block_Timer.H" #include diff --git a/Timeline/Engine/Audio_File.H b/timeline/src/Engine/Audio_File.H similarity index 99% rename from Timeline/Engine/Audio_File.H rename to timeline/src/Engine/Audio_File.H index ee894d7..0242d15 100644 --- a/Timeline/Engine/Audio_File.H +++ b/timeline/src/Engine/Audio_File.H @@ -27,7 +27,7 @@ #include #include "types.h" -#include "util/Mutex.H" +#include "Mutex.H" #include "Peaks.H" class Peak_Writer; diff --git a/Timeline/Engine/Audio_File_Dummy.C b/timeline/src/Engine/Audio_File_Dummy.C similarity index 100% rename from Timeline/Engine/Audio_File_Dummy.C rename to timeline/src/Engine/Audio_File_Dummy.C diff --git a/Timeline/Engine/Audio_File_Dummy.H b/timeline/src/Engine/Audio_File_Dummy.H similarity index 100% rename from Timeline/Engine/Audio_File_Dummy.H rename to timeline/src/Engine/Audio_File_Dummy.H diff --git a/Timeline/Engine/Audio_File_SF.C b/timeline/src/Engine/Audio_File_SF.C similarity index 99% rename from Timeline/Engine/Audio_File_SF.C rename to timeline/src/Engine/Audio_File_SF.C index 169b719..c381411 100644 --- a/Timeline/Engine/Audio_File_SF.C +++ b/timeline/src/Engine/Audio_File_SF.C @@ -32,7 +32,7 @@ // #define HAS_SF_FORMAT_VORBIS #include "const.h" -#include "util/debug.h" +#include "debug.h" diff --git a/Timeline/Engine/Audio_File_SF.H b/timeline/src/Engine/Audio_File_SF.H similarity index 100% rename from Timeline/Engine/Audio_File_SF.H rename to timeline/src/Engine/Audio_File_SF.H diff --git a/Timeline/Engine/Audio_Region.C b/timeline/src/Engine/Audio_Region.C similarity index 99% rename from Timeline/Engine/Audio_Region.C rename to timeline/src/Engine/Audio_Region.C index 6254f79..35ca784 100644 --- a/Timeline/Engine/Audio_Region.C +++ b/timeline/src/Engine/Audio_Region.C @@ -28,8 +28,8 @@ #include "const.h" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" diff --git a/Timeline/Engine/Audio_Sequence.C b/timeline/src/Engine/Audio_Sequence.C similarity index 98% rename from Timeline/Engine/Audio_Sequence.C rename to timeline/src/Engine/Audio_Sequence.C index 823c5d6..3949aaf 100644 --- a/Timeline/Engine/Audio_Sequence.C +++ b/timeline/src/Engine/Audio_Sequence.C @@ -22,8 +22,8 @@ #include "dsp.h" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" using namespace std; diff --git a/Timeline/Engine/Control_Sequence.C b/timeline/src/Engine/Control_Sequence.C similarity index 98% rename from Timeline/Engine/Control_Sequence.C rename to timeline/src/Engine/Control_Sequence.C index b3da295..e77ea6f 100644 --- a/Timeline/Engine/Control_Sequence.C +++ b/timeline/src/Engine/Control_Sequence.C @@ -22,8 +22,8 @@ #include "../Transport.H" // for ->frame #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" #include using std::list; diff --git a/Timeline/Engine/Disk_Stream.C b/timeline/src/Engine/Disk_Stream.C similarity index 99% rename from Timeline/Engine/Disk_Stream.C rename to timeline/src/Engine/Disk_Stream.C index 0cf84ed..bb94fdc 100644 --- a/Timeline/Engine/Disk_Stream.C +++ b/timeline/src/Engine/Disk_Stream.C @@ -28,7 +28,7 @@ class Audio_Sequence; #include "dsp.h" #include "const.h" -#include "util/debug.h" +#include "debug.h" diff --git a/Timeline/Engine/Disk_Stream.H b/timeline/src/Engine/Disk_Stream.H similarity index 98% rename from Timeline/Engine/Disk_Stream.H rename to timeline/src/Engine/Disk_Stream.H index 594a171..37300c4 100644 --- a/Timeline/Engine/Disk_Stream.H +++ b/timeline/src/Engine/Disk_Stream.H @@ -27,10 +27,10 @@ #include #include "types.h" -#include "util/Mutex.H" +#include "Mutex.H" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" class Track; class Audio_Sequence; diff --git a/Timeline/Engine/Engine.C b/timeline/src/Engine/Engine.C similarity index 99% rename from Timeline/Engine/Engine.C rename to timeline/src/Engine/Engine.C index 87c693e..2fcdd70 100644 --- a/Timeline/Engine/Engine.C +++ b/timeline/src/Engine/Engine.C @@ -26,8 +26,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" diff --git a/Timeline/Engine/Engine.H b/timeline/src/Engine/Engine.H similarity index 99% rename from Timeline/Engine/Engine.H rename to timeline/src/Engine/Engine.H index 6b440e1..4f8a726 100644 --- a/Timeline/Engine/Engine.H +++ b/timeline/src/Engine/Engine.H @@ -19,7 +19,7 @@ #pragma once -#include "util/Mutex.H" +#include "Mutex.H" class Port; diff --git a/Timeline/Engine/Peak.H b/timeline/src/Engine/Peak.H similarity index 100% rename from Timeline/Engine/Peak.H rename to timeline/src/Engine/Peak.H diff --git a/Timeline/Engine/Peaks.C b/timeline/src/Engine/Peaks.C similarity index 99% rename from Timeline/Engine/Peaks.C rename to timeline/src/Engine/Peaks.C index b33dfc0..694ffb9 100644 --- a/Timeline/Engine/Peaks.C +++ b/timeline/src/Engine/Peaks.C @@ -40,9 +40,9 @@ #include "assert.h" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" -#include "util/file.h" +#include "debug.h" +#include "Thread.H" +#include "file.h" #include diff --git a/Timeline/Engine/Peaks.H b/timeline/src/Engine/Peaks.H similarity index 100% rename from Timeline/Engine/Peaks.H rename to timeline/src/Engine/Peaks.H diff --git a/Timeline/Engine/Playback_DS.C b/timeline/src/Engine/Playback_DS.C similarity index 99% rename from Timeline/Engine/Playback_DS.C rename to timeline/src/Engine/Playback_DS.C index 3877293..c9d6366 100644 --- a/Timeline/Engine/Playback_DS.C +++ b/timeline/src/Engine/Playback_DS.C @@ -31,8 +31,8 @@ #include "dsp.h" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" bool Playback_DS::seek_pending ( void ) diff --git a/Timeline/Engine/Playback_DS.H b/timeline/src/Engine/Playback_DS.H similarity index 100% rename from Timeline/Engine/Playback_DS.H rename to timeline/src/Engine/Playback_DS.H diff --git a/Timeline/Engine/Record_DS.C b/timeline/src/Engine/Record_DS.C similarity index 99% rename from Timeline/Engine/Record_DS.C rename to timeline/src/Engine/Record_DS.C index 0998549..5d46ec6 100644 --- a/Timeline/Engine/Record_DS.C +++ b/timeline/src/Engine/Record_DS.C @@ -30,8 +30,8 @@ #include "dsp.h" #include "const.h" -#include "util/debug.h" -#include "util/Thread.H" +#include "debug.h" +#include "Thread.H" const Audio_Region * Record_DS::capture_region ( void ) const diff --git a/Timeline/Engine/Record_DS.H b/timeline/src/Engine/Record_DS.H similarity index 100% rename from Timeline/Engine/Record_DS.H rename to timeline/src/Engine/Record_DS.H diff --git a/Timeline/Engine/Timeline.C b/timeline/src/Engine/Timeline.C similarity index 99% rename from Timeline/Engine/Timeline.C rename to timeline/src/Engine/Timeline.C index d09452b..241a1ee 100644 --- a/Timeline/Engine/Timeline.C +++ b/timeline/src/Engine/Timeline.C @@ -25,7 +25,7 @@ #include "Record_DS.H" #include "Playback_DS.H" -#include "util/Thread.H" +#include "Thread.H" /** Initiate recording for all armed tracks */ bool diff --git a/Timeline/Engine/Track.C b/timeline/src/Engine/Track.C similarity index 100% rename from Timeline/Engine/Track.C rename to timeline/src/Engine/Track.C diff --git a/Timeline/Engine/const.h b/timeline/src/Engine/const.h similarity index 100% rename from Timeline/Engine/const.h rename to timeline/src/Engine/const.h diff --git a/Timeline/Engine/types.h b/timeline/src/Engine/types.h similarity index 100% rename from Timeline/Engine/types.h rename to timeline/src/Engine/types.h diff --git a/Timeline/Project.C b/timeline/src/Project.C similarity index 99% rename from Timeline/Project.C rename to timeline/src/Project.C index 72e5ea5..70d8a12 100644 --- a/Timeline/Project.C +++ b/timeline/src/Project.C @@ -40,9 +40,9 @@ #include #include "const.h" -#include "util/debug.h" -#include "util/file.h" -#include "util/Block_Timer.H" +#include "debug.h" +#include "file.h" +#include "Block_Timer.H" extern TLE *tle; diff --git a/Timeline/Project.H b/timeline/src/Project.H similarity index 100% rename from Timeline/Project.H rename to timeline/src/Project.H diff --git a/Timeline/RWLock.H b/timeline/src/RWLock.H similarity index 100% rename from Timeline/RWLock.H rename to timeline/src/RWLock.H diff --git a/Timeline/Scalebar.H b/timeline/src/Scalebar.H similarity index 100% rename from Timeline/Scalebar.H rename to timeline/src/Scalebar.H diff --git a/Timeline/Sequence.C b/timeline/src/Sequence.C similarity index 99% rename from Timeline/Sequence.C rename to timeline/src/Sequence.C index 3438333..454bf7e 100644 --- a/Timeline/Sequence.C +++ b/timeline/src/Sequence.C @@ -31,7 +31,7 @@ #include "../FL/Boxtypes.H" #include "const.h" -#include "util/debug.h" +#include "debug.h" using namespace std; diff --git a/Timeline/Sequence.H b/timeline/src/Sequence.H similarity index 100% rename from Timeline/Sequence.H rename to timeline/src/Sequence.H diff --git a/Timeline/Sequence_Point.C b/timeline/src/Sequence_Point.C similarity index 100% rename from Timeline/Sequence_Point.C rename to timeline/src/Sequence_Point.C diff --git a/Timeline/Sequence_Point.H b/timeline/src/Sequence_Point.H similarity index 100% rename from Timeline/Sequence_Point.H rename to timeline/src/Sequence_Point.H diff --git a/Timeline/Sequence_Region.C b/timeline/src/Sequence_Region.C similarity index 100% rename from Timeline/Sequence_Region.C rename to timeline/src/Sequence_Region.C diff --git a/Timeline/Sequence_Region.H b/timeline/src/Sequence_Region.H similarity index 100% rename from Timeline/Sequence_Region.H rename to timeline/src/Sequence_Region.H diff --git a/Timeline/Sequence_Widget.C b/timeline/src/Sequence_Widget.C similarity index 99% rename from Timeline/Sequence_Widget.C rename to timeline/src/Sequence_Widget.C index aec95b1..d6741e7 100644 --- a/Timeline/Sequence_Widget.C +++ b/timeline/src/Sequence_Widget.C @@ -23,7 +23,7 @@ #include "Track.H" #include "const.h" -#include "util/debug.h" +#include "debug.h" using namespace std; diff --git a/Timeline/Sequence_Widget.H b/timeline/src/Sequence_Widget.H similarity index 100% rename from Timeline/Sequence_Widget.H rename to timeline/src/Sequence_Widget.H diff --git a/Timeline/TLE.fl b/timeline/src/TLE.fl similarity index 99% rename from Timeline/TLE.fl rename to timeline/src/TLE.fl index 8c4628d..7a3f5ad 100644 --- a/Timeline/TLE.fl +++ b/timeline/src/TLE.fl @@ -931,7 +931,7 @@ if ( logo_box->image() ) code0 {static char pat[40];} code1 {snprintf( pat, sizeof( pat ), "%.1fK", size( "history" ) / (float)1024 );} code2 {o->value( pat );} - code3 {\#include "util/file.h"} + code3 {\#include "file.h"} } Fl_Output {} { label {Created On} diff --git a/Timeline/Tempo_Point.C b/timeline/src/Tempo_Point.C similarity index 100% rename from Timeline/Tempo_Point.C rename to timeline/src/Tempo_Point.C diff --git a/Timeline/Tempo_Point.H b/timeline/src/Tempo_Point.H similarity index 100% rename from Timeline/Tempo_Point.H rename to timeline/src/Tempo_Point.H diff --git a/Timeline/Tempo_Sequence.C b/timeline/src/Tempo_Sequence.C similarity index 100% rename from Timeline/Tempo_Sequence.C rename to timeline/src/Tempo_Sequence.C diff --git a/Timeline/Tempo_Sequence.H b/timeline/src/Tempo_Sequence.H similarity index 100% rename from Timeline/Tempo_Sequence.H rename to timeline/src/Tempo_Sequence.H diff --git a/Timeline/Time_Point.C b/timeline/src/Time_Point.C similarity index 100% rename from Timeline/Time_Point.C rename to timeline/src/Time_Point.C diff --git a/Timeline/Time_Point.H b/timeline/src/Time_Point.H similarity index 100% rename from Timeline/Time_Point.H rename to timeline/src/Time_Point.H diff --git a/Timeline/Time_Sequence.C b/timeline/src/Time_Sequence.C similarity index 100% rename from Timeline/Time_Sequence.C rename to timeline/src/Time_Sequence.C diff --git a/Timeline/Time_Sequence.H b/timeline/src/Time_Sequence.H similarity index 100% rename from Timeline/Time_Sequence.H rename to timeline/src/Time_Sequence.H diff --git a/Timeline/Timeline.C b/timeline/src/Timeline.C similarity index 99% rename from Timeline/Timeline.C rename to timeline/src/Timeline.C index 9082ff6..a058417 100644 --- a/Timeline/Timeline.C +++ b/timeline/src/Timeline.C @@ -44,7 +44,7 @@ #include "FL/menu_popup.H" #include "const.h" -#include "util/debug.h" +#include "debug.h" #ifdef USE_WIDGET_FOR_TIMELINE #define BASE Fl_Group diff --git a/Timeline/Timeline.H b/timeline/src/Timeline.H similarity index 100% rename from Timeline/Timeline.H rename to timeline/src/Timeline.H diff --git a/Timeline/Track.C b/timeline/src/Track.C similarity index 99% rename from Timeline/Track.C rename to timeline/src/Track.C index 2fe0883..53e0091 100644 --- a/Timeline/Track.C +++ b/timeline/src/Track.C @@ -39,7 +39,7 @@ #include "Annotation_Sequence.H" #include "const.h" -#include "util/debug.h" +#include "debug.h" diff --git a/Timeline/Track.H b/timeline/src/Track.H similarity index 100% rename from Timeline/Track.H rename to timeline/src/Track.H diff --git a/Timeline/Transport.C b/timeline/src/Transport.C similarity index 100% rename from Timeline/Transport.C rename to timeline/src/Transport.C diff --git a/Timeline/Transport.H b/timeline/src/Transport.H similarity index 100% rename from Timeline/Transport.H rename to timeline/src/Transport.H diff --git a/Timeline/Waveform.C b/timeline/src/Waveform.C similarity index 100% rename from Timeline/Waveform.C rename to timeline/src/Waveform.C diff --git a/Timeline/Waveform.H b/timeline/src/Waveform.H similarity index 100% rename from Timeline/Waveform.H rename to timeline/src/Waveform.H diff --git a/Timeline/const.h b/timeline/src/const.h similarity index 100% rename from Timeline/const.h rename to timeline/src/const.h diff --git a/Timeline/main.C b/timeline/src/main.C similarity index 98% rename from Timeline/main.C rename to timeline/src/main.C index 0fdf310..49a1f93 100644 --- a/Timeline/main.C +++ b/timeline/src/main.C @@ -46,7 +46,7 @@ #include "Transport.H" #include "Engine/Engine.H" -#include "util/Thread.H" +#include "Thread.H" Engine *engine; Timeline *timeline; @@ -64,7 +64,7 @@ const char COPYRIGHT[] = "Copyright (C) 2008-2010 Jonathan Moore Liles"; #include "const.h" -#include "util/debug.h" +#include "debug.h" char *user_config_dir; diff --git a/Timeline/types.h b/timeline/src/types.h similarity index 100% rename from Timeline/types.h rename to timeline/src/types.h