Changeset 51

Timestamp:

03/09/2008 13:24:55 (3 years ago)

Author:

douglas

Message:

Finish the renaming!

Files:

• DashInterface/DashInterface.cpp (modified) (1 diff)
• DashInterface/MenuList.cpp (modified) (4 diffs)
• DashInterface/MenuList.hpp (modified) (6 diffs)
• Music/GNUmakefile (modified) (2 diffs)
• Music/Music.cpp (moved) (moved from Music/MusicLibrary.cpp) (1 diff)
• Music/Music.hpp (moved) (moved from Music/MusicLibrary.hpp) (2 diffs)
• Music/Music.mk (moved) (moved from Music/MusicLibrary.mk) (1 diff)
• Music/Music.pl (moved) (moved from Music/MusicLibrary.pl) (1 diff)
• Music/Test.cpp (modified) (2 diffs)

DashInterface/DashInterface.cpp

@@ -35 +35 @@
         Audacious::Audacious audacious;
         //GPS::GPS gps;
-        MusicLibrary::Library library;
+        Music::Library library;
         MenuList *list;
         bool append;

DashInterface/MenuList.cpp

@@ -183 +183 @@
 }
 
-TopList::MusicItem::MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library) : MenuItem(list), MenuList::MusicItem(audacious, append), library(library)
+TopList::MusicItem::MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library) : MenuItem(list), MenuList::MusicItem(audacious, append), library(library)
 {
 }
@@ -197 +197 @@
 }
 
-TopList::TopList(Display &display, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library) : MenuList(this, display, 3)
+TopList::TopList(Display &display, Audacious::Audacious &audacious, bool &append, Music::Library &library) : MenuList(this, display, 3)
 {
         previous = NULL;
@@ -205 +205 @@
 }
 
-ArtistList::ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library) : MenuList(parent)
+ArtistList::ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, Music::Library &library) : MenuList(parent)
 {
         list[0] = new AllItem(this, audacious, append, library);
 }
 
-ArtistList::AllItem::AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library) : MenuItem(list), MusicItem(audacious, append), library(library)
+ArtistList::AllItem::AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library) : MenuItem(list), MusicItem(audacious, append), library(library)
 {
 }
@@ -218 +218 @@
         _L<std::string> songs;
 
-        _foreach (const _L<MusicLibrary::Song>, song, library.GetSongs())
+        _foreach (const _L<Music::Song>, song, library.GetSongs())
                 songs.push_back(song->GetPath());
 

DashInterface/MenuList.hpp

@@ -11 +11 @@
 
 #include <Audacious.hpp>
-#include <MusicLibrary.hpp>
+#include <Music.hpp>
 
 #include "Display.hpp"
@@ -121 +121 @@
         class MusicItem : public MenuItem, public SubItem, public MenuList::MusicItem
         {
-                MusicLibrary::Library &library;
+                Music::Library &library;
 
         public:
-                MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
+                MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library);
 
                 virtual MenuList *Select();
@@ -131 +131 @@
 
 public:
-        TopList(Display &display, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
+        TopList(Display &display, Audacious::Audacious &audacious, bool &append, Music::Library &library);
 };
 
@@ -138 +138 @@
         class AllItem : public MenuItem, public MusicItem
         {
-                MusicLibrary::Library &library;
+                Music::Library &library;
 
         public:
-                AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
+                AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library);
 
                 virtual MenuList *Select();
@@ -149 +149 @@
         class ArtistItem : public MenuItem, public SubItem, public MusicItem
         {
-                MusicLibrary::Artist artist;
+                Music::Artist artist;
 
         public:
-                ArtistItem(MenuList *list, Audacious::Audacious &audacious, bool append, MusicLibrary::Artist artist);
+                ArtistItem(MenuList *list, Audacious::Audacious &audacious, bool append, Music::Artist artist);
                 virtual ~ArtistItem() {}
 
@@ -160 +160 @@
 
 public:
-        ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
+        ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, Music::Library &library);
 };
 

Music/GNUmakefile

@@ -6 +6 @@
 
 common := ../Common
-musiclibrary := .
+music := .
 
 include $(common)/common.mk
-include $(musiclibrary)/MusicLibrary.mk
+include $(music)/Music.mk
 
-CPPFLAGS += -D_MusicLibrary_='"$(CURDIR)/MusicLibrary.db"'
+CPPFLAGS += -D_Music_='"$(CURDIR)/Music.db"'
 
 .PHONY: all clean
@@ -17 +17 @@
 all: Test
 
-Test: Test.o libMusicLibrary.a
+Test: Test.o libMusic.a
 
-libMusicLibrary.a: MusicLibrary.o
+libMusic.a: Music.o
 
 -include *.d
 
-$(eval $(call clean,Test libMusicLibrary.a *.d *.o))
+$(eval $(call clean,Test libMusic.a *.d *.o))

Music/Music.cpp

@@ -7 +7 @@
 #include <truck.hpp>
 
-#include "MusicLibrary.hpp"
+#include "Music.hpp"
 
-namespace MusicLibrary
+namespace Music
 {
 
-Library::Library() : connection(_B(_MusicLibrary_)), artists(connection.Prepare(_B("select id, name from artist order by name"))), artistAlbums(connection.Prepare(_B("select id, name, year from album where artist = ? order by year, name"))), albumSongs(connection.Prepare(_B("select id, name, path, track from song where album = ? order by track, path"))), songs(connection.Prepare(_B("select song.id, song.name, path, album, track from artist join album on (artist.id = album.artist) join song on (album.id = song.album) order by artist.name, year, album.name, track, path")))
+Library::Library() : connection(_B(_Music_)), artists(connection.Prepare(_B("select id, name from artist order by name"))), artistAlbums(connection.Prepare(_B("select id, name, year from album where artist = ? order by year, name"))), albumSongs(connection.Prepare(_B("select id, name, path, track from song where album = ? order by track, path"))), songs(connection.Prepare(_B("select song.id, song.name, path, album, track from artist join album on (artist.id = album.artist) join song on (album.id = song.album) order by artist.name, year, album.name, track, path")))
 {
 }

Music/Music.hpp

@@ -5 +5 @@
 // $Id$
 
-#ifndef _MusicLibrary_hpp_
-#define _MusicLibrary_hpp_
+#ifndef _Music_hpp_
+#define _Music_hpp_
 
 #include <sqlite3.hpp>
 #include <vector.hpp>
 
-namespace MusicLibrary
+namespace Music
 {
 
@@ -139 +139 @@
 }
 
-#endif//_MusicLibrary_hpp_
+#endif//_Music_hpp_

Music/Music.mk

@@ -5 +5 @@
 # $Id$
 
-CPPFLAGS += -I$(musiclibrary)
-LDFLAGS += -L$(musiclibrary)
-LDLIBS += -lMusicLibrary
+CPPFLAGS += -I$(music)
+LDFLAGS += -L$(music)
+LDLIBS += -lMusic

Music/Music.pl

@@ -24 +24 @@
 Usage() if ($#directories == -1);
 
-my $db = DBI->connect('dbi:SQLite:dbname=' . dirname($0) . '/MusicLibrary.db', '', '', {RaiseError => 1});
+my $db = DBI->connect('dbi:SQLite:dbname=' . dirname($0) . '/Music.db', '', '', {RaiseError => 1});
 
 $db->prepare(<<EOF)->execute;

Music/Test.cpp

@@ -10 +10 @@
 #include <truck.hpp>
 
-#include "MusicLibrary.hpp"
+#include "Music.hpp"
 
 int main(int argc, char *argv[])
@@ -16 +16 @@
         try
         {
-                MusicLibrary::Library library;
+                Music::Library library;
 
-                /*_foreach (const _L<MusicLibrary::Artist>, artist, library.GetArtists())
+                /*_foreach (const _L<Music::Artist>, artist, library.GetArtists())
                 {
                         std::cout << artist->GetId() << ' ' << artist->GetName() << std::endl;
 
-                        _foreach (const _L<MusicLibrary::Album>, album, artist->GetAlbums())
+                        _foreach (const _L<Music::Album>, album, artist->GetAlbums())
                         {
                                 std::cout << album->GetId() << ' ' << album->GetName() << ' ' << album->GetYear() << std::endl;
 
-                                _foreach (const _L<MusicLibrary::Song>, song, album->GetSongs())
+                                _foreach (const _L<Music::Song>, song, album->GetSongs())
                                         std::cout << song->GetId() << ' ' << song->GetName() << ' ' << song->GetPath() << ' ' << song->GetTrack() << std::endl;
                         }
                 }*/
 
-                _foreach (const _L<MusicLibrary::Song>, song, library.GetSongs())
+                _foreach (const _L<Music::Song>, song, library.GetSongs())
                         std::cout << song->GetId() << ' ' << song->GetName() << ' ' << song->GetPath() << ' ' << song->GetTrack() << std::endl;
         }