From 37d953e48faeb122387dd9df7f8a5f12152561ec Mon Sep 17 00:00:00 2001 From: wrathematics Date: Thu, 13 Nov 2014 10:24:52 -0500 Subject: [PATCH 1/2] markdown readme --- README | 282 ------------------------------------------------- README.md | 307 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 307 insertions(+), 282 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 809c9e5..0000000 --- a/README +++ /dev/null @@ -1,282 +0,0 @@ -HARP Documentation - -Contents: - I.Installation and Setup - II.Manager Interface - 1)Insert - 2)List - 3)Edit - 4)Admin - III.Customization - 1)Configuration File - IV.Requirements - - -I. Installation and Setup - -Installing harp: - mkdir build && cd build - cmake {options} .. - To select a sound output (REQUIRED) use one of: - cmake -DWITH_OSS=ON .. - or - cmake -DWITH_JACK=ON .. - or - cmake -DWITH_ALSA=ON .. - or - cmake -DWITH_PULSE=ON .. - - To build without certain plugins use -DWITH_pluginname=OFF: - cmake -DWITH_MP3=OFF -DWITH_FLAC=OFF .. - Currently available are mp3, aac, vorbis, flac and stream - make - sudo make install - -Enable the plugins in harp (this may be done automatically): - harp -a - select plugin management: - Admin> p - add a plugin: - Plugins> a - Library (e.g., libharpmp3): libharpmp3 - Plugins> a - Library (e.g., libharpmp3): libharpaac - ... - -Check that the plugins have been installed: - list added plugins: - manage plugins> l - -(optional) Create a configuration file: -Note: your paths may be different. - cp /usr/local/share/harp/defaults.conf ~/.harp/defaults.conf - - - -II. Manager Interface - -1. Insert - Insert a song into the system. If the insert flag is given with no - argument, songs may be entered at the prompt. Inserts may be given - with an argument of the song path to add a song from the command - line. If a directory is given as an argument, HARP will scan - the directory recursively and add all valid files into the system. - -2. List - List detailed song information or list the songs related to an - album, artist, or playlist. If given no argument, all members - of that category are listed. - - -3a. Edit Shell - -Commands are accepted in the following pattern: - selector(...) action[(...)] [action[(...)] [ ... ]] - - The name used for selector determines which class of items the - actions are applied to. The selector's arguments (...) select - items of that type and can be one or more numeric IDs, "names", - or subselectors(...). Names may be enclosed by double quotes(") - to match similar names, or single quotes(') to match exact - names. Action changes those selected items in the database. If - multiple actions are provided, they will be run one after the - other as they were specified from left to right. If an action - does not use arguments, no () are needed. Otherwise, the required - number of arguments should be provided separated by commas. - -Selection commands: - song Edit song(s). - album Edit album(s). - artist Edit artist(s). - playlist Edit playlist(s). - tag Edit tag(s). - -Selection filters: - Selection commands can be filtered by ID, name, or through - subcommands. - For example, to select only the song with ID 12 and songs that - are in either an album named foo or by an artist named bar: - song(12,album("foo"),artist("bar")) - -Song actions: - list List the state of the selected songs. - title Change the title of the songs. - (1 string arg - new title) - track Change the track number of the songs. - (1 numeric arg - track number) - location Change the location of the songs. - (1 string arg - absolute path) - albumArtist Change the album and artist of the songs. - (2 args: name string or id - album, artist) - delete Delete the selected songs. - activate Toggle the activation status of the songs. - -Album actions - list List the state of the selected albums. - title Change the title of the albums. - (1 string arg - new title) - artist Change the artist of the selected albms. - (1 arg as either name string or id - artist) - date Change the date of the selected albums. - (1 numeric arg - new date) - -Artist actions - list List the state of the selected artists. - name Change the name of the artists. - (1 string arg - new name) - -Playlist actions - list List the state of the selected playlists. - contents List the songs in the selected playlists. - name Change the name of the playlists. - (1 string arg - new name) - delete Delete the playlists. - order Change the order of a song in the playlist. - (2 numeric args - old order, new order) - add Add a song to the playlist. - (2 args - song name string or ID, numeric order) - removeOrder Remove a song from the playlists. - (1 numeric arg - order number to remove) - removeSong Remove a song from the playlists. - (1 numeric arg - name string or ID) - -Tag actions - list List the state of the selected tags. - contents List the songs in the selected tags. - name Change the name of the tags. - (1 string arg - new name) - delete Delete the tags. - add Add a song to the tags. - (1 arg - song name string or ID) - remove Remove a song from the tags. - (1 numeric arg - name string or ID of song to remove) - - -3b. Edit Portal (deprecated) - -Song commands: - L List the songs that will be affected. - t Change the title of the song. - l Change the location of the song. - r Change the song's artist. - a Change the song's album. - d Remove the song from the database. - The original file will remain intact. - v Toggle Activation: Toggle the active status of - the song. Provide an argument of 0 to deactivate or 1 - to activate the selected songs. Default behaviour is - to flip the status of each song. Deactivated songs are - similar to deleted songs except that they keep their - play statistics and may be played only if reactivated - or if directly chosen to be played with the --type=s flag. - g Change which genres the song belongs to. - Song-Genre commands: - L List the genres the song belongs to. - a Add the song to a genre. - r Remove the song from a genre. - -Album commands: - NOTE: Commands that require additional input can take - it as an argument - (e.g., t NewTitle) - L List the albums that will be affected. - t Change the album's title. - r Change the album's artist. - -Artist commands: - NOTE: Commands that require additional input can take - it as an argument - (e.g., n NewName) - L List the artists that will be affected. - n Change the artist's name. - -Playlist commands: - NOTE: Commands that require additional input can take - it as an argument - (n NewName) or (o 10 4) - L List playlists that will be affected - LC List contents of the playlists that will be affected - c Create a new playlist. - n Change the name of the playlist. - d Delete the playlist. Songs will remain in the database. - a Add a song to the playlist. - r Remove a song from the playlist. - (Takes an argument of Order. Not SongID) - o Change the order of a song in the playlist. - (Takes two arguments: current order and new order) - -Genre commands: - NOTE: Commands that require additional input can take - it as an argument - (e.g., n NewName) - L List genres that will be affected - LC List contents of the genres that will be affected - a Add a genre. - n Change the name of the genre. - o Change the genre's owner (parent). - d Delete the genre. If a song is left without any genres, - it will be added to the 'Unknown' genre at the end of - the session. - - -4. Admin - -Manage Plugins (p) - a Add - Add a plugin to the system. Plugin must already be - installed. - l List - List all plugins in the system - r Remove - Remove a plugin from the system. - t Toggle activation - Toggle the activation status of a plugin. Deactivated - plugins will only be used if all activated plugins of - the correct type are unavailable. - PluginID can either be given as: - manage plugins> t x - or - manage plugins> t - PluginID: x - where x is the PluginID - -Manage Stats (s) - r Reset stats - a Reset all - r Reset ratings - d Reset play count - s Reset skip count - l Reset last play time - e Export stats - Stats will be output to a file in tab separated columns - sorted by file location. - - -III. Customization - -1. Configuration File: - This located at ~/.harp/defaults.conf - -General format for this file: - -Comments start with # - -Section names are enclosed in [] - -Options are in the format: option=setting - - - -IV. Requirements - -Sound output: - One of: ALSA, OSS, JACK, or PulseAudio - JACK also requires libsamplerate -Database: - SQLite3 -Default Decoders: - MP3: libmpg123 - - http://www.mpg123.de/ - AAC: libfaad2 - - http://www.audiocoding.com/downloads.html - OGG: libvorbisfile - - http://www.xiph.org/downloads/ - FLAC: libFLAC - - http://www.xiph.org/downloads/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..a7dce59 --- /dev/null +++ b/README.md @@ -0,0 +1,307 @@ +# HARP + +## Contents + +I. Installation and Setup + +II. Manager Interface + 1. Insert + 2. List + 3. Edit + 4. Admin + +III. Customization + 1. Configuration File + +IV. Requirements + + +## I. Installation and Setup + +#### Installing harp + +1. `mkdir build && cd build` +2. `cmake {options} ..` + * To select a sound output (REQUIRED) use one of: + - `cmake -DWITH_OSS=ON ..` + or + - `cmake -DWITH_JACK=ON ..` + or + - `cmake -DWITH_ALSA=ON ..` + or + - `cmake -DWITH_PULSE=ON ..` + + * To build without certain plugins use `-DWITH_pluginname=OFF`: + - `cmake -DWITH_MP3=OFF -DWITH_FLAC=OFF ..` + * Currently available are mp3, aac, vorbis, flac and stream +3. `make` +4. `sudo make install` + +#### Enable the plugins in harp (this may be done automatically) +1. `harp -a` + select plugin management: + +``` +Admin> p + add a plugin: +Plugins> a +Library (e.g., libharpmp3): libharpmp3 +Plugins> a +Library (e.g., libharpmp3): libharpaac + ... +``` + +Check that the plugins have been installed: + list added plugins: + manage plugins> l + +(optional) Create a configuration file: +Note: your paths may be different. + +``` +cp /usr/local/share/harp/defaults.conf ~/.harp/defaults.conf +``` + + +## Manager Interface + +1. Insert + +> Insert a song into the system. If the insert flag is given with no +> argument, songs may be entered at the prompt. Inserts may be given +> with an argument of the song path to add a song from the command +> line. If a directory is given as an argument, HARP will scan +> the directory recursively and add all valid files into the system. + +2. List + +> List detailed song information or list the songs related to an +> album, artist, or playlist. If given no argument, all members +> of that category are listed. + + +3. Edit Shell + +> Commands are accepted in the following pattern: +> +> `selector(...) action[(...)] [action[(...)] [ ... ]]` + +> The name used for selector determines which class of items the +> actions are applied to. The selector's arguments (...) select +> items of that type and can be one or more numeric IDs, "names", +> or subselectors(...). Names may be enclosed by double quotes(") +> to match similar names, or single quotes(') to match exact +> names. Action changes those selected items in the database. If +> multiple actions are provided, they will be run one after the +> other as they were specified from left to right. If an action +> does not use arguments, no () are needed. Otherwise, the required +> number of arguments should be provided separated by commas. + +> * Selection commands: +> - *song* Edit song(s). +> - *album* Edit album(s). +> - *artist* Edit artist(s). +> - *playlist* Edit playlist(s). +> - *tag* Edit tag(s). + +> * Selection filters: +> Selection commands can be filtered by ID, name, or through +> subcommands. For example, to select only the song with ID 12 and songs that +> are in either an album named foo or by an artist named bar: +> song(12,album("foo"),artist("bar")) + +> * Song actions: +> - *list* List the state of the selected songs. +> - *title* Change the title of the songs. +> (1 string arg - new title) +> - *track* Change the track number of the songs. +> (1 numeric arg - track number) +> - *location* Change the location of the songs. +> (1 string arg - absolute path) +> - *albumArtist* Change the album and artist of the songs. +> (2 args: name string or id - album, artist) +> - *delete* Delete the selected songs. +> - *activate* Toggle the activation status of the songs. + +> * Album actions +> - *list* List the state of the selected albums. +> - *title* Change the title of the albums. +> (1 string arg - new title) +> - *artist* Change the artist of the selected albms. +> (1 arg as either name string or id - artist) +> - *date* Change the date of the selected albums. +> (1 numeric arg - new date) + +> * Artist actions +> - *list* List the state of the selected artists. +> - *name* Change the name of the artists. +> (1 string arg - new name) + +> * Playlist actions +> - *list* List the state of the selected playlists. +> - *contents* List the songs in the selected playlists. +> - *name* Change the name of the playlists. +> (1 string arg - new name) +> - *delete* Delete the playlists. +> - *order* Change the order of a song in the playlist. +> (2 numeric args - old order, new order) +> - *add* Add a song to the playlist. +> (2 args - song name string or ID, numeric order) +> - *removeOrder* Remove a song from the playlists. +> (1 numeric arg - order number to remove) +> - *removeSong* Remove a song from the playlists. +> (1 numeric arg - name string or ID) + +> * Tag actions +> - *list* List the state of the selected tags. +> - *contents* List the songs in the selected tags. +> - *name* Change the name of the tags. +> (1 string arg - new name) +> - *delete* Delete the tags. +> - *add* Add a song to the tags. +> (1 arg - song name string or ID) +> - *remove* Remove a song from the tags. +> (1 numeric arg - name string or ID of song to remove) + + +4. Edit Portal (deprecated) + +> * Song commands: +> - *L* List the songs that will be affected. +> - *t* Change the title of the song. +> - *l* Change the location of the song. +> - *r* Change the song's artist. +> - *a* Change the song's album. +> - *d* Remove the song from the database. +> The original file will remain intact. +> - *v* Toggle Activation: Toggle the active status of +> the song. Provide an argument of 0 to deactivate or 1 +> to activate the selected songs. Default behaviour is +> to flip the status of each song. Deactivated songs are +> similar to deleted songs except that they keep their +> play statistics and may be played only if reactivated +> or if directly chosen to be played with the --type=s flag. +> - *g* Change which genres the song belongs to. +> +> Song-Genre commands: +> - *L* List the genres the song belongs to. +> - *a* Add the song to a genre. +> - *r* Remove the song from a genre. + +> * Album commands: +> +> NOTE: Commands that require additional input can take +> it as an argument (e.g., t NewTitle) +> - *L* List the albums that will be affected. +> - *t* Change the album's title. +> - *r* Change the album's artist. + +> * Artist commands: +> +> NOTE: Commands that require additional input can take +> it as an argument (e.g., n NewName) +> - *L* List the artists that will be affected. +> - *n* Change the artist's name. + +> * Playlist commands: +> +> NOTE: Commands that require additional input can take +> it as an argument (n NewName) or (o 10 4) +> - *L* List playlists that will be affected +> - *LC* List contents of the playlists that will be affected +> - *c* Create a new playlist. +> - *n* Change the name of the playlist. +> - *d* Delete the playlist. Songs will remain in the database. +> - *a* Add a song to the playlist. +> - *r* Remove a song from the playlist. +> (Takes an argument of Order. Not SongID) +> - *o* Change the order of a song in the playlist. +> (Takes two arguments: current order and new order) + +> * Genre commands: +> +> NOTE: Commands that require additional input can take +> it as an argument (e.g., n NewName) +> - *L* List genres that will be affected +> - *LC* List contents of the genres that will be affected +> - *a* Add a genre. +> - *n* Change the name of the genre. +> - *o* Change the genre's owner (parent). +> - *d* Delete the genre. If a song is left without any genres, +> it will be added to the 'Unknown' genre at the end of +> the session. + + +5. Admin + +> * Manage Plugins (p) +> +> - *a* Add +> +> Add a plugin to the system. Plugin must already be +> installed. +> - *l* List +> +> List all plugins in the system +> - *r* Remove +> +> Remove a plugin from the system. +> - *t* Toggle activation +> +> Toggle the activation status of a plugin. Deactivated +> plugins will only be used if all activated plugins of +> the correct type are unavailable. +> +> PluginID can either be given as: +> +> `manage plugins> t x` +> +> or +> +> `manage plugins> t` +> +> PluginID: x +> +> where x is the PluginID + +> * Manage Stats (s) +> r Reset stats +> a Reset all +> r Reset ratings +> d Reset play count +> s Reset skip count +> l Reset last play time +> e Export stats +> Stats will be output to a file in tab separated columns +> sorted by file location. + + +## Customization + +1. Configuration File: + + This located at `~/.harp/defaults.conf` + +2. General format for this file: + - Comments start with `#` + - Section names are enclosed in `[]` + - Options are in the format: `option=setting` + + + +## Requirements + +* Sound output: + - One of: ALSA, OSS, JACK, or PulseAudio + - JACK also requires libsamplerate +* Database: + - SQLite3 +* Default Decoders: + - MP3: libmpg123 + - http://www.mpg123.de/ + - AAC: libfaad2 + - http://www.audiocoding.com/downloads.html + - OGG: libvorbisfile + - http://www.xiph.org/downloads/ + - FLAC: libFLAC + - http://www.xiph.org/downloads/ From dd7398eb5e44a0df3a43ce4c6cc03954dc5ac3f2 Mon Sep 17 00:00:00 2001 From: wrathematics Date: Thu, 13 Nov 2014 10:29:17 -0500 Subject: [PATCH 2/2] moved source to src/ --- CMakeLists.txt | 42 ++++++++++++++++---------------- admin.c => src/admin.c | 0 admin.h => src/admin.h | 0 alsautil.c => src/alsautil.c | 0 alsautil.h => src/alsautil.h | 0 argparse.c => src/argparse.c | 0 argparse.h => src/argparse.h | 0 build.c => src/build.c | 0 build.h => src/build.h | 0 dbact.c => src/dbact.c | 0 dbact.h => src/dbact.h | 0 defs.h => src/defs.h | 0 defs_h.c => src/defs_h.c | 0 edit.c => src/edit.c | 0 edit.h => src/edit.h | 0 edit.tab.c => src/edit.tab.c | 0 edit.tab.h => src/edit.tab.h | 0 edit_shell.c => src/edit_shell.c | 0 edit_shell.h => src/edit_shell.h | 0 harp.c => src/harp.c | 0 harp.h => src/harp.h | 0 harpconfig.c => src/harpconfig.c | 0 harpconfig.h => src/harpconfig.h | 0 insert.c => src/insert.c | 0 insert.h => src/insert.h | 0 jackutil.c => src/jackutil.c | 0 jackutil.h => src/jackutil.h | 0 lex.c => src/lex.c | 0 lex.h => src/lex.h | 0 lex_dfa.c => src/lex_dfa.c | 0 lex_dfa.h => src/lex_dfa.h | 0 list.c => src/list.c | 0 list.h => src/list.h | 0 message.c => src/message.c | 0 message.h => src/message.h | 0 ossutil.c => src/ossutil.c | 0 ossutil.h => src/ossutil.h | 0 player.c => src/player.c | 0 player.h => src/player.h | 0 portal.c => src/portal.c | 0 portal.h => src/portal.h | 0 pulseutil.c => src/pulseutil.c | 0 pulseutil.h => src/pulseutil.h | 0 shuffle.c => src/shuffle.c | 0 shuffle.h => src/shuffle.h | 0 sndutil.c => src/sndutil.c | 0 sndutil.h => src/sndutil.h | 0 tree.c => src/tree.c | 0 tree.h => src/tree.h | 0 util.c => src/util.c | 0 util.h => src/util.h | 0 51 files changed, 21 insertions(+), 21 deletions(-) rename admin.c => src/admin.c (100%) rename admin.h => src/admin.h (100%) rename alsautil.c => src/alsautil.c (100%) rename alsautil.h => src/alsautil.h (100%) rename argparse.c => src/argparse.c (100%) rename argparse.h => src/argparse.h (100%) rename build.c => src/build.c (100%) rename build.h => src/build.h (100%) rename dbact.c => src/dbact.c (100%) rename dbact.h => src/dbact.h (100%) rename defs.h => src/defs.h (100%) rename defs_h.c => src/defs_h.c (100%) rename edit.c => src/edit.c (100%) rename edit.h => src/edit.h (100%) rename edit.tab.c => src/edit.tab.c (100%) rename edit.tab.h => src/edit.tab.h (100%) rename edit_shell.c => src/edit_shell.c (100%) rename edit_shell.h => src/edit_shell.h (100%) rename harp.c => src/harp.c (100%) rename harp.h => src/harp.h (100%) rename harpconfig.c => src/harpconfig.c (100%) rename harpconfig.h => src/harpconfig.h (100%) rename insert.c => src/insert.c (100%) rename insert.h => src/insert.h (100%) rename jackutil.c => src/jackutil.c (100%) rename jackutil.h => src/jackutil.h (100%) rename lex.c => src/lex.c (100%) rename lex.h => src/lex.h (100%) rename lex_dfa.c => src/lex_dfa.c (100%) rename lex_dfa.h => src/lex_dfa.h (100%) rename list.c => src/list.c (100%) rename list.h => src/list.h (100%) rename message.c => src/message.c (100%) rename message.h => src/message.h (100%) rename ossutil.c => src/ossutil.c (100%) rename ossutil.h => src/ossutil.h (100%) rename player.c => src/player.c (100%) rename player.h => src/player.h (100%) rename portal.c => src/portal.c (100%) rename portal.h => src/portal.h (100%) rename pulseutil.c => src/pulseutil.c (100%) rename pulseutil.h => src/pulseutil.h (100%) rename shuffle.c => src/shuffle.c (100%) rename shuffle.h => src/shuffle.h (100%) rename sndutil.c => src/sndutil.c (100%) rename sndutil.h => src/sndutil.h (100%) rename tree.c => src/tree.c (100%) rename tree.h => src/tree.h (100%) rename util.c => src/util.c (100%) rename util.h => src/util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d39b480..86514df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,27 +55,27 @@ include_directories(${SQLITE_INCLUDE_DIR}) add_subdirectory (plugins) add_executable (harp ${SOUND_SRC} -harp.c -defs_h.c -argparse.c -harpconfig.c -dbact.c -insert.c -edit.c -edit_shell.c -util.c -message.c -player.c -shuffle.c -list.c -admin.c -portal.c -tree.c -edit.tab.c -build.c -lex.c -lex_dfa.c -sndutil.c) +src/harp.c +src/defs_h.c +src/argparse.c +src/harpconfig.c +src/dbact.c +src/insert.c +src/edit.c +src/edit_shell.c +src/util.c +src/message.c +src/player.c +src/shuffle.c +src/list.c +src/admin.c +src/portal.c +src/tree.c +src/edit.tab.c +src/build.c +src/lex.c +src/lex_dfa.c +src/sndutil.c) target_link_libraries (harp ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${SOUND_LIB} ${SQLITE_LIBRARIES}) diff --git a/admin.c b/src/admin.c similarity index 100% rename from admin.c rename to src/admin.c diff --git a/admin.h b/src/admin.h similarity index 100% rename from admin.h rename to src/admin.h diff --git a/alsautil.c b/src/alsautil.c similarity index 100% rename from alsautil.c rename to src/alsautil.c diff --git a/alsautil.h b/src/alsautil.h similarity index 100% rename from alsautil.h rename to src/alsautil.h diff --git a/argparse.c b/src/argparse.c similarity index 100% rename from argparse.c rename to src/argparse.c diff --git a/argparse.h b/src/argparse.h similarity index 100% rename from argparse.h rename to src/argparse.h diff --git a/build.c b/src/build.c similarity index 100% rename from build.c rename to src/build.c diff --git a/build.h b/src/build.h similarity index 100% rename from build.h rename to src/build.h diff --git a/dbact.c b/src/dbact.c similarity index 100% rename from dbact.c rename to src/dbact.c diff --git a/dbact.h b/src/dbact.h similarity index 100% rename from dbact.h rename to src/dbact.h diff --git a/defs.h b/src/defs.h similarity index 100% rename from defs.h rename to src/defs.h diff --git a/defs_h.c b/src/defs_h.c similarity index 100% rename from defs_h.c rename to src/defs_h.c diff --git a/edit.c b/src/edit.c similarity index 100% rename from edit.c rename to src/edit.c diff --git a/edit.h b/src/edit.h similarity index 100% rename from edit.h rename to src/edit.h diff --git a/edit.tab.c b/src/edit.tab.c similarity index 100% rename from edit.tab.c rename to src/edit.tab.c diff --git a/edit.tab.h b/src/edit.tab.h similarity index 100% rename from edit.tab.h rename to src/edit.tab.h diff --git a/edit_shell.c b/src/edit_shell.c similarity index 100% rename from edit_shell.c rename to src/edit_shell.c diff --git a/edit_shell.h b/src/edit_shell.h similarity index 100% rename from edit_shell.h rename to src/edit_shell.h diff --git a/harp.c b/src/harp.c similarity index 100% rename from harp.c rename to src/harp.c diff --git a/harp.h b/src/harp.h similarity index 100% rename from harp.h rename to src/harp.h diff --git a/harpconfig.c b/src/harpconfig.c similarity index 100% rename from harpconfig.c rename to src/harpconfig.c diff --git a/harpconfig.h b/src/harpconfig.h similarity index 100% rename from harpconfig.h rename to src/harpconfig.h diff --git a/insert.c b/src/insert.c similarity index 100% rename from insert.c rename to src/insert.c diff --git a/insert.h b/src/insert.h similarity index 100% rename from insert.h rename to src/insert.h diff --git a/jackutil.c b/src/jackutil.c similarity index 100% rename from jackutil.c rename to src/jackutil.c diff --git a/jackutil.h b/src/jackutil.h similarity index 100% rename from jackutil.h rename to src/jackutil.h diff --git a/lex.c b/src/lex.c similarity index 100% rename from lex.c rename to src/lex.c diff --git a/lex.h b/src/lex.h similarity index 100% rename from lex.h rename to src/lex.h diff --git a/lex_dfa.c b/src/lex_dfa.c similarity index 100% rename from lex_dfa.c rename to src/lex_dfa.c diff --git a/lex_dfa.h b/src/lex_dfa.h similarity index 100% rename from lex_dfa.h rename to src/lex_dfa.h diff --git a/list.c b/src/list.c similarity index 100% rename from list.c rename to src/list.c diff --git a/list.h b/src/list.h similarity index 100% rename from list.h rename to src/list.h diff --git a/message.c b/src/message.c similarity index 100% rename from message.c rename to src/message.c diff --git a/message.h b/src/message.h similarity index 100% rename from message.h rename to src/message.h diff --git a/ossutil.c b/src/ossutil.c similarity index 100% rename from ossutil.c rename to src/ossutil.c diff --git a/ossutil.h b/src/ossutil.h similarity index 100% rename from ossutil.h rename to src/ossutil.h diff --git a/player.c b/src/player.c similarity index 100% rename from player.c rename to src/player.c diff --git a/player.h b/src/player.h similarity index 100% rename from player.h rename to src/player.h diff --git a/portal.c b/src/portal.c similarity index 100% rename from portal.c rename to src/portal.c diff --git a/portal.h b/src/portal.h similarity index 100% rename from portal.h rename to src/portal.h diff --git a/pulseutil.c b/src/pulseutil.c similarity index 100% rename from pulseutil.c rename to src/pulseutil.c diff --git a/pulseutil.h b/src/pulseutil.h similarity index 100% rename from pulseutil.h rename to src/pulseutil.h diff --git a/shuffle.c b/src/shuffle.c similarity index 100% rename from shuffle.c rename to src/shuffle.c diff --git a/shuffle.h b/src/shuffle.h similarity index 100% rename from shuffle.h rename to src/shuffle.h diff --git a/sndutil.c b/src/sndutil.c similarity index 100% rename from sndutil.c rename to src/sndutil.c diff --git a/sndutil.h b/src/sndutil.h similarity index 100% rename from sndutil.h rename to src/sndutil.h diff --git a/tree.c b/src/tree.c similarity index 100% rename from tree.c rename to src/tree.c diff --git a/tree.h b/src/tree.h similarity index 100% rename from tree.h rename to src/tree.h diff --git a/util.c b/src/util.c similarity index 100% rename from util.c rename to src/util.c diff --git a/util.h b/src/util.h similarity index 100% rename from util.h rename to src/util.h