diff --git a/src/Hare/Hare/AppView.cpp b/src/Hare/Hare/AppView.cpp index 62beaf8..4ce176b 100644 --- a/src/Hare/Hare/AppView.cpp +++ b/src/Hare/Hare/AppView.cpp @@ -1,61 +1,70 @@ +#include "AppView.h" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include +#include #include "../AudioInfo/AudioAttributes.h" #include "../AudioInfo/GenreList.h" -#include + #include "AppDefs.h" -#include "AppView.h" #include "AppWindow.h" #include "CommandConstants.h" #include "CheckMark.h" -#include "GUIStrings.h" #include "EditorView.h" #include "EncoderListView.h" #include "FileNamePatternView.h" +#include "GUIStrings.h" #include "Settings.h" #include "StatusBarFilter.h" -AppView::AppView(BRect frame) : BView(frame, "AppView", B_FOLLOW_ALL, - B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP) { +AppView::AppView(BRect frame) + : + BView(frame, "AppView", B_FOLLOW_ALL, + B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP) +{ PRINT(("AppView::AppView(BRect)\n")); } -AppView::~AppView() { +AppView::~AppView() +{ PRINT(("AppView::~AppView()\n")); stop_watching(this); } void -AppView::InitView() { +AppView::InitView() +{ PRINT(("AppView::InitView()\n")); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -131,7 +140,8 @@ AppView::InitView() { } void -AppView::AttachedToWindow() { +AppView::AttachedToWindow() +{ PRINT(("AppView::AttachedToWindow()\n")); BView::AttachedToWindow(); @@ -144,7 +154,8 @@ AppView::AttachedToWindow() { } void -AppView::MessageReceived(BMessage* message) { +AppView::MessageReceived(BMessage* message) +{ //PRINT(("AppView::MessageReceived(BMessage*)\n")); switch (message->what) { case VIEW_SHORTCUT: { @@ -257,7 +268,8 @@ AppView::MessageReceived(BMessage* message) { } int32 -AppView::RefsRecievedWrapper(void* args) { +AppView::RefsRecievedWrapper(void* args) +{ PRINT(("AppView::RefsReceivedWrapper(void*)\n")); BList* params = (BList*)args; @@ -270,7 +282,8 @@ AppView::RefsRecievedWrapper(void* args) { } void -AppView::RefsReceived(BMessage* message) { +AppView::RefsReceived(BMessage* message) +{ PRINT(("AppView::RefsReceived(BMessage*)\n")); CLVRefListItem* item; @@ -334,7 +347,8 @@ AppView::RefsReceived(BMessage* message) { } void -AppView::InitializeColumn(CLVRefListItem* item) { +AppView::InitializeColumn(CLVRefListItem* item) +{ PRINT(("AppView::InitializeColumn(CLVRefListItem*)\n")); entry_ref* ref = item->EntryRef(); @@ -413,7 +427,8 @@ AppView::InitializeColumn(CLVRefListItem* item) { } void -AppView::SetSaveAsColumn(CLVRefListItem* item) { +AppView::SetSaveAsColumn(CLVRefListItem* item) +{ PRINT(("AppView::SetSaveAsColumn(CLVRefListItem*)\n")); const char* artist = item->GetColumnContentText(ARTIST_COLUMN_INDEX); @@ -446,7 +461,8 @@ AppView::SetSaveAsColumn(CLVRefListItem* item) { } void -AppView::ApplyAttributeChanges(BMessage* message) { +AppView::ApplyAttributeChanges(BMessage* message) +{ PRINT(("AppView::ApplyAttributeChanges(BMessage*)\n")); type_code index_type; @@ -504,7 +520,8 @@ AppView::ApplyAttributeChanges(BMessage* message) { } void -AppView::RemoveNodeFromList(node_ref* ref) { +AppView::RemoveNodeFromList(node_ref* ref) +{ CLVRefListItem* item; node_ref* itemRef; int32 numItems = listView->CountItems(); @@ -529,7 +546,8 @@ AppView::RemoveNodeFromList(node_ref* ref) { } void -AppView::RemoveDeviceItemsFromList(int32 device) { +AppView::RemoveDeviceItemsFromList(int32 device) +{ PRINT(("AppView::RemoveDeviceItemsFromList(int32)\n")); bool deleted = false; @@ -558,7 +576,8 @@ AppView::RemoveDeviceItemsFromList(int32 device) { } int32 -AppView::RemoveItemsFromList(void* args) { +AppView::RemoveItemsFromList(void* args) +{ PRINT(("AppView::RemoveItemsFromList(void*)\n")); AppView* view = (AppView*)args; @@ -582,7 +601,8 @@ AppView::RemoveItemsFromList(void* args) { } int32 -AppView::UpdateItem(BMessage* message) { +AppView::UpdateItem(BMessage* message) +{ PRINT(("AppView::UpdateItem(BMessage*)\n")); ino_t node; @@ -667,7 +687,8 @@ AppView::UpdateItem(BMessage* message) { } void -AppView::Encode() { +AppView::Encode() +{ PRINT(("AppView::Encode()\n")); thread_id thread = spawn_thread(AppView::EncodeThread, "_Encoder_", @@ -676,7 +697,8 @@ AppView::Encode() { } int32 -AppView::EncodeThread(void* args) { +AppView::EncodeThread(void* args) +{ PRINT(("AppView::EncodeThread(void*)\n")); settings->SetEncoding(true); @@ -1032,7 +1054,8 @@ AppView::EncodeThread(void* args) { } void -AppView::Cancel() { +AppView::Cancel() +{ PRINT(("AppView::Cancel()\n")); if (settings->IsEncoding()) { @@ -1045,7 +1068,8 @@ AppView::Cancel() { } void -AppView::AlertUser(const char* message) { +AppView::AlertUser(const char* message) +{ PRINT(("AppView::AlertUser(const char*)\n")); BAlert* alert = new BAlert("alert", message, OK, NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); diff --git a/src/Hare/Hare/AppView.h b/src/Hare/Hare/AppView.h index bf8e735..b4db278 100644 --- a/src/Hare/Hare/AppView.h +++ b/src/Hare/Hare/AppView.h @@ -1,7 +1,7 @@ #ifndef __APP_VIEW_H__ #define __APP_VIEW_H__ -#include +#include class BetterScrollView; class BButton; diff --git a/src/Hare/Hare/AppWindow.cpp b/src/Hare/Hare/AppWindow.cpp index 76fe02d..f15717d 100644 --- a/src/Hare/Hare/AppWindow.cpp +++ b/src/Hare/Hare/AppWindow.cpp @@ -1,26 +1,30 @@ +#include "AppWindow.h" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include + #include "AppDefs.h" #include "AppView.h" -#include "AppWindow.h" #include "CommandConstants.h" #include "GUIStrings.h" #include "Settings.h" @@ -34,20 +38,27 @@ #define WIN_MIN_HEIGHT 500 // was 400 #define WIN_MAX_HEIGHT 500 // was 1000 -AppWindow::AppWindow() : BWindow(BRect(WIN_LEFT, WIN_TOP, WIN_RIGHT, WIN_BOTTOM), - APPLICATION, B_TITLED_WINDOW, B_NOT_RESIZABLE /*B_ASYNCHRONOUS_CONTROLS*/) { +AppWindow::AppWindow() + : + BWindow(BRect(WIN_LEFT, WIN_TOP, WIN_RIGHT, WIN_BOTTOM), + APPLICATION, B_TITLED_WINDOW, B_NOT_RESIZABLE /*B_ASYNCHRONOUS_CONTROLS*/) +{ PRINT(("AppWindow::AppWindow()\n")); InitWindow(); } -AppWindow::AppWindow(BMessage* archive) : BWindow(archive) { +AppWindow::AppWindow(BMessage* archive) + : + BWindow(archive) +{ PRINT(("AppWindow::AppWindow(BMessage*)\n")); InitWindow(); } -AppWindow::~AppWindow() { +AppWindow::~AppWindow() +{ PRINT(("AppWindow::~AppWindow()\n")); stop_watching(this); @@ -58,7 +69,8 @@ AppWindow::~AppWindow() { } void -AppWindow::InitWindow() { +AppWindow::InitWindow() +{ PRINT(("AppWindow::InitWindow()\n")); Settings::OpenSettings(); @@ -124,14 +136,16 @@ AppWindow::InitWindow() { } BMenuBar* -AppWindow::MenuBar() { +AppWindow::MenuBar() +{ PRINT(("AppWindow::MenuBar()\n")); return menuBar; } void -AppWindow::InitMenus() { +AppWindow::InitMenus() +{ PRINT(("AppWindow::InitMenus()\n")); menuBar = new BMenuBar(BRect(), "menuBar"); @@ -196,7 +210,8 @@ AppWindow::InitMenus() { } void -AppWindow::LoadCDMenu() { +AppWindow::LoadCDMenu() +{ PRINT(("AppWindow::LoadCDMenu()\n")); int32 numItems = loadCdMenu->CountItems(); @@ -227,7 +242,8 @@ AppWindow::LoadCDMenu() { } void -AppWindow::LoadEncoderMenu() { +AppWindow::LoadEncoderMenu() +{ PRINT(("AppWindow::LoadEncoderMenu()\n")); if (!settings->IsEncoding()) { @@ -321,7 +337,8 @@ AppWindow::LoadEncoderMenu() { } void -AppWindow::MenuItemSelected(BMessage* message) { +AppWindow::MenuItemSelected(BMessage* message) +{ PRINT(("AppWindow::MenuItemSelected(BMessage*)\n")); BMenuItem* item; @@ -399,7 +416,8 @@ AppWindow::MenuItemSelected(BMessage* message) { } void -AppWindow::AddVolumeToList(const char* name) { +AppWindow::AddVolumeToList(const char* name) +{ PRINT(("AppWindow::AddVolumeToList(const char*)\n")); volumes->Rewind(); @@ -415,7 +433,8 @@ AppWindow::AddVolumeToList(const char* name) { } void -AppWindow::AddVolumeToList(dev_t device) { +AppWindow::AddVolumeToList(dev_t device) +{ PRINT(("AppWindow::AddVolumeToList(dev_t)\n")); BVolume volume(device); @@ -435,7 +454,8 @@ AppWindow::AddVolumeToList(dev_t device) { } void -AppWindow::AboutRequested() { +AppWindow::AboutRequested() +{ PRINT(("AppWindow::AboutRequested()\n")); BString msg; @@ -453,7 +473,8 @@ AppWindow::AboutRequested() { } void -AppWindow::FrameResized(float width, float height) { +AppWindow::FrameResized(float width, float height) +{ #ifdef DEBUG BString title = APPLICATION; title << " WIDTH="; @@ -465,7 +486,8 @@ AppWindow::FrameResized(float width, float height) { } void -AppWindow::MessageReceived(BMessage* message) { +AppWindow::MessageReceived(BMessage* message) +{ //PRINT(("AppWindow::MessageReceived(BMessage*)\n")); switch (message->what) { @@ -541,14 +563,16 @@ AppWindow::MessageReceived(BMessage* message) { } void -AppWindow::RefsReceived(BMessage* message) { +AppWindow::RefsReceived(BMessage* message) +{ PRINT(("AppWindow::RefsReceived(BMessage*)\n")); viewMessenger->SendMessage(message); } bool -AppWindow::QuitRequested() { +AppWindow::QuitRequested() +{ PRINT(("AppWindow::QuitRequested()\n")); if (settings->IsEncoding()) { @@ -573,7 +597,8 @@ AppWindow::QuitRequested() { } AppWindow* -AppWindow::GetInstance() { +AppWindow::GetInstance() +{ PRINT(("AppWindow::GetInstance()\n")); BPath path; @@ -596,7 +621,8 @@ AppWindow::GetInstance() { } void -AppWindow::SaveWindow() { +AppWindow::SaveWindow() +{ PRINT(("AppWindow::SaveWindow()\n")); BPath path; diff --git a/src/Hare/Hare/AppWindow.h b/src/Hare/Hare/AppWindow.h index 1af3729..4b8f1b0 100644 --- a/src/Hare/Hare/AppWindow.h +++ b/src/Hare/Hare/AppWindow.h @@ -1,7 +1,7 @@ #ifndef __APP_WINDOW_H__ #define __APP_WINDOW_H__ -#include +#include class AppView; class BMessage; diff --git a/src/Hare/Hare/Application.cpp b/src/Hare/Hare/Application.cpp index cc58313..4c6af57 100644 --- a/src/Hare/Hare/Application.cpp +++ b/src/Hare/Hare/Application.cpp @@ -1,14 +1,19 @@ -#include -#include -#include -#include -#include "AppDefs.h" #include "Application.h" + +#include +#include +#include +#include + +#include "AppDefs.h" #include "AppWindow.h" #include "GUIStrings.h" #include "Settings.h" -Application::Application() : BApplication(SIGNATURE) { +Application::Application() + : + BApplication(SIGNATURE) +{ PRINT(("Application::Application()\n")); add_system_beep_event(SYSTEM_BEEP_ENCODING_DONE); @@ -17,19 +22,22 @@ Application::Application() : BApplication(SIGNATURE) { window->Show(); } -Application::~Application() { +Application::~Application() +{ PRINT(("Application::~Application()\n")); delete settings; } void -Application::ArgvReceived(int32 argc, char** argv) { +Application::ArgvReceived(int32 argc, char** argv) +{ PRINT(("Application::ArgvReceived(int32,char**)\n")); } void -Application::MessageReceived(BMessage* message) { +Application::MessageReceived(BMessage* message) +{ //PRINT(("Application::MessageReceived(BMessage*)\n")); switch (message->what) { @@ -39,14 +47,16 @@ Application::MessageReceived(BMessage* message) { } void -Application::RefsReceived(BMessage* message) { +Application::RefsReceived(BMessage* message) +{ PRINT(("Application::RefsReceived(BMessage*)\n")); window->PostMessage(message); } int -main() { +main() +{ PRINT(("main()\n")); new Application(); diff --git a/src/Hare/Hare/Application.h b/src/Hare/Hare/Application.h index 27960f5..17c885e 100644 --- a/src/Hare/Hare/Application.h +++ b/src/Hare/Hare/Application.h @@ -1,7 +1,7 @@ #ifndef __APPLICATION_H__ #define __APPLICATION_H__ -#include +#include class AppWindow; class BMessage; diff --git a/src/Hare/Hare/AudioAttribute.cpp b/src/Hare/Hare/AudioAttribute.cpp index 8050f11..c461c80 100644 --- a/src/Hare/Hare/AudioAttribute.cpp +++ b/src/Hare/Hare/AudioAttribute.cpp @@ -1,21 +1,24 @@ +#include "AudioAttribute.h" + #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include #include "String/String.h" -#include "AudioAttribute.h" AudioAttribute::AudioAttribute(BFile* file, const char* name, - const char* attribute, type_code type) { + const char* attribute, type_code type) +{ PRINT(("AudioAttribute::AudioAttribute(BFile*,const char*)\n")); strcpy(this->name, name); @@ -25,7 +28,8 @@ AudioAttribute::AudioAttribute(BFile* file, const char* name, this->value = 0; } -AudioAttribute::~AudioAttribute() { +AudioAttribute::~AudioAttribute() +{ PRINT(("AudioAttribute::~AudioAttribute()\n")); delete [] value; @@ -33,7 +37,8 @@ AudioAttribute::~AudioAttribute() { } bool -AudioAttribute::Exists() { +AudioAttribute::Exists() +{ PRINT(("AudioAttribute::Exists()\n")); BNodeInfo nodeInfo(file); @@ -69,7 +74,8 @@ AudioAttribute::Exists() { } int32 -AudioAttribute::Create() { +AudioAttribute::Create() +{ PRINT(("AudioAttribute::Create()\n")); BNodeInfo nodeInfo(file); @@ -110,7 +116,8 @@ AudioAttribute::Create() { } bool -AudioAttribute::IsIndexed(dev_t device) { +AudioAttribute::IsIndexed(dev_t device) +{ PRINT(("AudioAttribute::IsIndexed(dev_t)\n")); bool found = false; @@ -130,7 +137,8 @@ AudioAttribute::IsIndexed(dev_t device) { } int32 -AudioAttribute::Index(dev_t device) { +AudioAttribute::Index(dev_t device) +{ PRINT(("AudioAttribute::Index(dev_t)\n")); if (IsIndexed(device)) { @@ -145,7 +153,8 @@ AudioAttribute::Index(dev_t device) { } int32 -AudioAttribute::RemoveIndex(dev_t device) { +AudioAttribute::RemoveIndex(dev_t device) +{ PRINT(("AudioAttribute::RemoveIndex(dev_t)\n")); if (!IsIndexed(device)) { @@ -160,14 +169,16 @@ AudioAttribute::RemoveIndex(dev_t device) { } const char* -AudioAttribute::Value() { +AudioAttribute::Value() +{ PRINT(("AudioAttribute::Value()\n")); return this->value; } void -AudioAttribute::SetValue(const char* val) { +AudioAttribute::SetValue(const char* val) +{ PRINT(("AudioAttribute::SetValue(const char*)\n")); delete [] this->value; @@ -182,7 +193,8 @@ AudioAttribute::SetValue(const char* val) { } status_t -AudioAttribute::Read() { +AudioAttribute::Read() +{ PRINT(("AudioAttribute::Read()\n")); if (!file->IsReadable()) { @@ -233,7 +245,8 @@ AudioAttribute::Read() { } status_t -AudioAttribute::Write() { +AudioAttribute::Write() +{ PRINT(("AudioAttribute::Write()\n")); if (!file->IsWritable()) { diff --git a/src/Hare/Hare/AudioAttribute.h b/src/Hare/Hare/AudioAttribute.h index 67d0048..faa55f6 100644 --- a/src/Hare/Hare/AudioAttribute.h +++ b/src/Hare/Hare/AudioAttribute.h @@ -1,7 +1,7 @@ #ifndef __AUDIO_ATTRIBUTE_H__ #define __AUDIO_ATTRIBUTE_H__ -#include +#include class BFile; diff --git a/src/Hare/Hare/AudioAttributes.cpp b/src/Hare/Hare/AudioAttributes.cpp index 2fb480b..df598fd 100644 --- a/src/Hare/Hare/AudioAttributes.cpp +++ b/src/Hare/Hare/AudioAttributes.cpp @@ -1,10 +1,14 @@ +#include "AudioAttributes.h" + #include #include -#include -#include -#include + +#include +#include +#include + #include -#include "AudioAttributes.h" + #include "AudioAttribute.h" #define ARTIST_NAME "Artist" @@ -35,7 +39,10 @@ #define COMPOSER_ATTR "Audio:Composer" #endif -AudioAttributes::AudioAttributes(BFile* file) : AudioInfo() { +AudioAttributes::AudioAttributes(BFile* file) + : + AudioInfo() +{ PRINT(("AudioAttributes::AudioAttributes(BFile*)\n")); this->file = file; @@ -69,7 +76,8 @@ AudioAttributes::AudioAttributes(BFile* file) : AudioInfo() { Read(); } -AudioAttributes::~AudioAttributes() { +AudioAttributes::~AudioAttributes() +{ PRINT(("AudioAttributes::~AudioAttributes()\n")); delete artist; @@ -88,7 +96,8 @@ AudioAttributes::~AudioAttributes() { status_t -AudioAttributes::InitAttribute(AudioAttribute* attrib) { +AudioAttributes::InitAttribute(AudioAttribute* attrib) +{ PRINT(("AudioAttributes::InitAttribute(AudioAttribute*)\n")); if (!attrib) { @@ -103,42 +112,48 @@ AudioAttributes::InitAttribute(AudioAttribute* attrib) { } const char* -AudioAttributes::Artist() { +AudioAttributes::Artist() +{ PRINT(("AudioAttributes::Artist()\n")); return artist->Value(); } const char* -AudioAttributes::Album() { +AudioAttributes::Album() +{ PRINT(("AudioAttributes::Album()\n")); return album->Value(); } const char* -AudioAttributes::Title() { +AudioAttributes::Title() +{ PRINT(("AudioAttributes::Title()\n")); return title->Value(); } const char* -AudioAttributes::Year() { +AudioAttributes::Year() +{ PRINT(("AudioAttributes::Year()\n")); return year->Value(); } const char* -AudioAttributes::Comment() { +AudioAttributes::Comment() +{ PRINT(("AudioAttributes::Comment()\n")); return comment->Value(); } const char* -AudioAttributes::Track() { +AudioAttributes::Track() +{ PRINT(("AudioAttributes::Track()\n")); return track->Value(); @@ -146,21 +161,24 @@ AudioAttributes::Track() { #ifdef _TTE_ const char* -AudioAttributes::Rating() { +AudioAttributes::Rating() +{ PRINT(("AudioAttributes::Rating()\n")); return rating->Value(); } const char* -AudioAttributes::Tempo() { +AudioAttributes::Tempo() +{ PRINT(("AudioAttributes::Tempo()\n")); return tempo->Value(); } const char* -AudioAttributes::Composer() { +AudioAttributes::Composer() +{ PRINT(("AudioAttributes::Composer()\n")); return composer->Value(); @@ -168,49 +186,56 @@ AudioAttributes::Composer() { #endif const char* -AudioAttributes::Genre() { +AudioAttributes::Genre() +{ PRINT(("AudioAttributes::Genre()\n")); return genre->Value(); } void -AudioAttributes::SetArtist(const char* value) { +AudioAttributes::SetArtist(const char* value) +{ PRINT(("AudioAttributes::SetArtist(const char*)\n")); artist->SetValue(value); } void -AudioAttributes::SetAlbum(const char* value) { +AudioAttributes::SetAlbum(const char* value) +{ PRINT(("AudioAttributes::SetAlbum(const char*)\n")); album->SetValue(value); } void -AudioAttributes::SetTitle(const char* value) { +AudioAttributes::SetTitle(const char* value) +{ PRINT(("AudioAttributes::SetTitle(const char*)\n")); title->SetValue(value); } void -AudioAttributes::SetYear(const char* value) { +AudioAttributes::SetYear(const char* value) +{ PRINT(("AudioAttributes::SetYear(const char*)\n")); year->SetValue(value); } void -AudioAttributes::SetComment(const char* value) { +AudioAttributes::SetComment(const char* value) +{ PRINT(("AudioAttributes::SetComment(const char*)\n")); comment->SetValue(value); } void -AudioAttributes::SetTrack(const char* value) { +AudioAttributes::SetTrack(const char* value) +{ PRINT(("AudioAttributes::SetTrack(const char*)\n")); track->SetValue(value); @@ -218,21 +243,24 @@ AudioAttributes::SetTrack(const char* value) { #ifdef _TTE_ void -AudioAttributes::SetRating(const char* value) { +AudioAttributes::SetRating(const char* value) +{ PRINT(("AudioAttributes::SetRating(const char*)\n")); rating->SetValue(value); } void -AudioAttributes::SetTempo(const char* value) { +AudioAttributes::SetTempo(const char* value) +{ PRINT(("AudioAttributes::SetTempo(const char*)\n")); tempo->SetValue(value); } void -AudioAttributes::SetComposer(const char* value) { +AudioAttributes::SetComposer(const char* value) +{ PRINT(("AudioAttributes::SetComposer(const char*)\n")); composer->SetValue(value); @@ -240,14 +268,16 @@ AudioAttributes::SetComposer(const char* value) { #endif void -AudioAttributes::SetGenre(const char* value) { +AudioAttributes::SetGenre(const char* value) +{ PRINT(("AudioAttributes::SetGenre(const char*)\n")); genre->SetValue(value); } status_t -AudioAttributes::Read() { +AudioAttributes::Read() +{ PRINT(("AudioAttributes::Read()\n")); int status = B_OK; @@ -274,42 +304,48 @@ AudioAttributes::Read() { } status_t -AudioAttributes::ReadArtist() { +AudioAttributes::ReadArtist() +{ PRINT(("AudioAttributes::ReadArtist()\n")); return artist->Read(); } status_t -AudioAttributes::ReadAlbum() { +AudioAttributes::ReadAlbum() +{ PRINT(("AudioAttributes::ReadAlbum()\n")); return album->Read(); } status_t -AudioAttributes::ReadTitle() { +AudioAttributes::ReadTitle() +{ PRINT(("AudioAttributes::ReadTitle()\n")); return title->Read(); } status_t -AudioAttributes::ReadYear() { +AudioAttributes::ReadYear() +{ PRINT(("AudioAttributes::ReadYear()\n")); return year->Read(); } status_t -AudioAttributes::ReadComment() { +AudioAttributes::ReadComment() +{ PRINT(("AudioAttributes::ReadComment()\n")); return comment->Read(); } status_t -AudioAttributes::ReadTrack() { +AudioAttributes::ReadTrack() +{ PRINT(("AudioAttributes::ReadTrack()\n")); int retval = track->Read(); @@ -323,21 +359,24 @@ AudioAttributes::ReadTrack() { #ifdef _TTE_ status_t -AudioAttributes::ReadRating() { +AudioAttributes::ReadRating() +{ PRINT(("AudioAttributes::ReadRating()\n")); return rating->Read(); } status_t -AudioAttributes::ReadTempo() { +AudioAttributes::ReadTempo() +{ PRINT(("AudioAttributes::ReadTempo()\n")); return tempo->Read(); } status_t -AudioAttributes::ReadComposer() { +AudioAttributes::ReadComposer() +{ PRINT(("AudioAttributes::ReadComposer()\n")); return composer->Read(); @@ -345,14 +384,16 @@ AudioAttributes::ReadComposer() { #endif status_t -AudioAttributes::ReadGenre() { +AudioAttributes::ReadGenre() +{ PRINT(("AudioAttributes::ReadGenre()\n")); return genre->Read(); } status_t -AudioAttributes::Write() { +AudioAttributes::Write() +{ PRINT(("AudioAttributes::Write()\n")); int status = B_OK; @@ -379,42 +420,48 @@ AudioAttributes::Write() { } status_t -AudioAttributes::WriteArtist() { +AudioAttributes::WriteArtist() +{ PRINT(("AudioAttributes::WriteArtist()\n")); return artist->Write(); } status_t -AudioAttributes::WriteAlbum() { +AudioAttributes::WriteAlbum() +{ PRINT(("AudioAttributes::WriteAlbum()\n")); return album->Write(); } status_t -AudioAttributes::WriteTitle() { +AudioAttributes::WriteTitle() +{ PRINT(("AudioAttributes::WriteTitle()\n")); return title->Write(); } status_t -AudioAttributes::WriteYear() { +AudioAttributes::WriteYear() +{ PRINT(("AudioAttributes::WriteYear()\n")); return year->Write(); } status_t -AudioAttributes::WriteComment() { +AudioAttributes::WriteComment() +{ PRINT(("AudioAttributes::WriteComment()\n")); return comment->Write(); } status_t -AudioAttributes::WriteTrack() { +AudioAttributes::WriteTrack() +{ PRINT(("AudioAttributes::WriteTrack()\n")); return track->Write(); @@ -422,21 +469,24 @@ AudioAttributes::WriteTrack() { #ifdef _TTE_ status_t -AudioAttributes::WriteRating() { +AudioAttributes::WriteRating() +{ PRINT(("AudioAttributes::WriteRating()\n")); return rating->Write(); } status_t -AudioAttributes::WriteTempo() { +AudioAttributes::WriteTempo() +{ PRINT(("AudioAttributes::WriteTempo()\n")); return tempo->Write(); } status_t -AudioAttributes::WriteComposer() { +AudioAttributes::WriteComposer() +{ PRINT(("AudioAttributes::WriteComposer()\n")); return composer->Write(); @@ -444,7 +494,8 @@ AudioAttributes::WriteComposer() { #endif status_t -AudioAttributes::WriteGenre() { +AudioAttributes::WriteGenre() +{ PRINT(("AudioAttributes::WriteGenre()\n")); return genre->Write(); diff --git a/src/Hare/Hare/AudioInfo.cpp b/src/Hare/Hare/AudioInfo.cpp index 6a6b439..023b1ab 100644 --- a/src/Hare/Hare/AudioInfo.cpp +++ b/src/Hare/Hare/AudioInfo.cpp @@ -1,101 +1,120 @@ -#include -#include #include "AudioInfo.h" -AudioInfo::AudioInfo() { +#include + +#include + +AudioInfo::AudioInfo() +{ PRINT(("AudioInfo::AudioInfo()\n")); } -AudioInfo::~AudioInfo() { +AudioInfo::~AudioInfo() +{ PRINT(("AudioInfo::~AudioInfo()\n")); } const char* -AudioInfo::Artist() { +AudioInfo::Artist() +{ PRINT(("AudioInfo::Artist()\n")); return 0; } const char* -AudioInfo::Album() { +AudioInfo::Album() +{ PRINT(("AudioInfo::Album()\n")); return 0; } const char* -AudioInfo::Title() { +AudioInfo::Title() +{ PRINT(("AudioInfo::Title()\n")); return 0; } const char* -AudioInfo::Year() { +AudioInfo::Year() +{ PRINT(("AudioInfo::Year()\n")); return 0; } const char* -AudioInfo::Comment() { +AudioInfo::Comment() +{ PRINT(("AudioInfo::Comment()\n")); return 0; } const char* -AudioInfo::Track() { +AudioInfo::Track() +{ PRINT(("AudioInfo::Track()\n")); return 0; } const char* -AudioInfo::Genre() { +AudioInfo::Genre() +{ PRINT(("AudioInfo::Genre()\n")); return 0; } void -AudioInfo::SetArtist(const char* value) { +AudioInfo::SetArtist(const char* value) +{ PRINT(("AudioInfo::SetArtist(const char*)\n")); } void -AudioInfo::SetAlbum(const char* value) { +AudioInfo::SetAlbum(const char* value) +{ PRINT(("AudioInfo::SetAlbum(const char*)\n")); } void -AudioInfo::SetTitle(const char* value) { +AudioInfo::SetTitle(const char* value) +{ PRINT(("AudioInfo::SetTitle(const char*)\n")); } void -AudioInfo::SetYear(const char* value) { +AudioInfo::SetYear(const char* value) +{ PRINT(("AudioInfo::SetYear(const char*)\n")); } void -AudioInfo::SetComment(const char* value) { +AudioInfo::SetComment(const char* value) +{ PRINT(("AudioInfo::SetComment(const char*)\n")); } void -AudioInfo::SetTrack(const char* value) { +AudioInfo::SetTrack(const char* value) +{ PRINT(("AudioInfo::SetTrack(const char*)\n")); } void -AudioInfo::SetGenre(const char* value) { +AudioInfo::SetGenre(const char* value) +{ PRINT(("AudioInfo::SetGenre(const char*)\n")); } status_t -AudioInfo::Read() { +AudioInfo::Read() +{ PRINT(("AudioInfo::Read()\n")); int status; @@ -134,56 +153,64 @@ AudioInfo::Read() { } status_t -AudioInfo::ReadArtist() { +AudioInfo::ReadArtist() +{ PRINT(("AudioInfo::ReadArtist()\n")); return B_OK; } status_t -AudioInfo::ReadAlbum() { +AudioInfo::ReadAlbum() +{ PRINT(("AudioInfo::ReadAlbum()\n")); return B_OK; } status_t -AudioInfo::ReadTitle() { +AudioInfo::ReadTitle() +{ PRINT(("AudioInfo::ReadTitle()\n")); return B_OK; } status_t -AudioInfo::ReadYear() { +AudioInfo::ReadYear() +{ PRINT(("AudioInfo::ReadYear()\n")); return B_OK; } status_t -AudioInfo::ReadComment() { +AudioInfo::ReadComment() +{ PRINT(("AudioInfo::ReadComment()\n")); return B_OK; } status_t -AudioInfo::ReadTrack() { +AudioInfo::ReadTrack() +{ PRINT(("AudioInfo::ReadTrack()\n")); return B_OK; } status_t -AudioInfo::ReadGenre() { +AudioInfo::ReadGenre() +{ PRINT(("AudioInfo::ReadGenre()\n")); return B_OK; } status_t -AudioInfo::Write() { +AudioInfo::Write() +{ PRINT(("AudioInfo::Write()\n")); int status; @@ -221,7 +248,8 @@ AudioInfo::Write() { } status_t -AudioInfo::WriteArtist() { +AudioInfo::WriteArtist() +{ PRINT(("AudioInfo::WriteArtist()\n")); return B_OK; @@ -235,42 +263,48 @@ AudioInfo::WriteAlbum() { } status_t -AudioInfo::WriteTitle() { +AudioInfo::WriteTitle() +{ PRINT(("AudioInfo::WriteTitle()\n")); return B_OK; } status_t -AudioInfo::WriteYear() { +AudioInfo::WriteYear() +{ PRINT(("AudioInfo::WriteYear()\n")); return B_OK; } status_t -AudioInfo::WriteComment() { +AudioInfo::WriteComment() +{ PRINT(("AudioInfo::WriteComment()\n")); return B_OK; } status_t -AudioInfo::WriteTrack() { +AudioInfo::WriteTrack() +{ PRINT(("AudioInfo::WriteTrack()\n")); return B_OK; } status_t -AudioInfo::WriteGenre() { +AudioInfo::WriteGenre() +{ PRINT(("AudioInfo::WriteGenre()\n")); return B_OK; } void -AudioInfo::PrintToStream() { +AudioInfo::PrintToStream() +{ printf("\n"); printf("Artist = %s\n", Artist()); printf("Album = %s\n", Album()); diff --git a/src/Hare/Hare/CheckMark.cpp b/src/Hare/Hare/CheckMark.cpp index b9d044b..0666fa6 100644 --- a/src/Hare/Hare/CheckMark.cpp +++ b/src/Hare/Hare/CheckMark.cpp @@ -1,7 +1,10 @@ -#include #include "CheckMark.h" -CheckMark::CheckMark() : - BBitmap(BRect(0, 0, kImageWidth, kImageHeight), kImageColorSpace) { +#include + +CheckMark::CheckMark() + : + BBitmap(BRect(0, 0, kImageWidth, kImageHeight), kImageColorSpace) +{ SetBits(kImageBits, BitsLength(), 0, kImageColorSpace); } diff --git a/src/Hare/Hare/CheckMark.h b/src/Hare/Hare/CheckMark.h index 056765a..e329372 100644 --- a/src/Hare/Hare/CheckMark.h +++ b/src/Hare/Hare/CheckMark.h @@ -1,7 +1,8 @@ #ifndef __CHECK_MARK_H__ #define __CHECK_MARK_H__ -#include +#include + #include "CheckMarkData.h" class CheckMark : public BBitmap { diff --git a/src/Hare/Hare/EditorView.cpp b/src/Hare/Hare/EditorView.cpp index e98fa41..0e73183 100644 --- a/src/Hare/Hare/EditorView.cpp +++ b/src/Hare/Hare/EditorView.cpp @@ -1,37 +1,46 @@ +#include "EditorView.h" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../AudioInfo/GenreList.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include +#include "../AudioInfo/GenreList.h" + #include "AppDefs.h" #include "CommandConstants.h" -#include "EditorView.h" #include "GUIStrings.h" -EditorView::EditorView(BRect frame) : BBox(frame, "editorView") { +EditorView::EditorView(BRect frame) + : + BBox(frame, "editorView") +{ PRINT(("EditorView::EditorView(BRect)\n")); } -EditorView::~EditorView() { +EditorView::~EditorView() +{ PRINT(("EditorView::~EditorView()\n")); } void -EditorView::InitView() { +EditorView::InitView() +{ PRINT(("EditorView::InitView()\n")); SetLabel(EDITOR_LABEL); @@ -222,7 +231,8 @@ EditorView::InitView() { } void -EditorView::AttachedToWindow() { +EditorView::AttachedToWindow() +{ PRINT(("EditorView::AttachedToWindow()\n")); InitView(); @@ -260,7 +270,8 @@ EditorView::AttachedToWindow() { } void -EditorView::GetPreferredSize(float* width, float* height) { +EditorView::GetPreferredSize(float* width, float* height) +{ PRINT(("EditorView::GetPreferredSize(float* float*)\n")); int space = 6; @@ -275,7 +286,8 @@ EditorView::GetPreferredSize(float* width, float* height) { } void -EditorView::Apply() { +EditorView::Apply() +{ PRINT(("EditorView::Apply()\n")); BMessage message(APPLY_ATTRIBUTE_CHANGES); @@ -323,7 +335,8 @@ EditorView::Apply() { } void -EditorView::ListSelectionChanged(BMessage* message) { +EditorView::ListSelectionChanged(BMessage* message) +{ PRINT(("EditorView::ListSelectionChanged(BMessage*)\n")); free(selectedIndexes); @@ -396,7 +409,8 @@ EditorView::ListSelectionChanged(BMessage* message) { } void -EditorView::EnableCheckBoxes(bool value) { +EditorView::EnableCheckBoxes(bool value) +{ artistCheckBox->SetEnabled(value); albumCheckBox->SetEnabled(value); titleCheckBox->SetEnabled(value); @@ -407,7 +421,8 @@ EditorView::EnableCheckBoxes(bool value) { } void -EditorView::SetControlValues(CLVRefListItem* item) { +EditorView::SetControlValues(CLVRefListItem* item) +{ artistTextControl->SetText(""); albumTextControl->SetText(""); titleTextControl->SetText(""); @@ -453,14 +468,16 @@ EditorView::SetControlValues(CLVRefListItem* item) { } void -EditorView::MakeFocus(bool focused) { +EditorView::MakeFocus(bool focused) +{ PRINT(("EditorView::MakeFocus(bool)\n")); artistCheckBox->MakeFocus(focused); } void -EditorView::SetEnabled(bool value) { +EditorView::SetEnabled(bool value) +{ PRINT(("EditorView::SetEnabled(bool)\n")); EnableCheckBoxes(value); @@ -487,7 +504,8 @@ EditorView::SetEnabled(bool value) { } void -EditorView::SetEnabled(BCheckBox* checkbox, BControl* control) { +EditorView::SetEnabled(BCheckBox* checkbox, BControl* control) +{ PRINT(("EditorView::SetEnabled(BCheckBox*,BControl*)\n")); if (checkbox->Value() == B_CONTROL_ON) { @@ -498,7 +516,8 @@ EditorView::SetEnabled(BCheckBox* checkbox, BControl* control) { } void -EditorView::SetEnabled(BCheckBox* checkbox, BMenuField* menufield) { +EditorView::SetEnabled(BCheckBox* checkbox, BMenuField* menufield) +{ PRINT(("EditorView::SetEnabled(BCheckBox*,BMenuField*)\n")); if (checkbox->Value() == B_CONTROL_ON) { @@ -509,7 +528,8 @@ EditorView::SetEnabled(BCheckBox* checkbox, BMenuField* menufield) { } void -EditorView::MessageReceived(BMessage* message) { +EditorView::MessageReceived(BMessage* message) +{ //PRINT(("EditorView::MessageReceived(BMessage*)\n")); switch (message->what) { diff --git a/src/Hare/Hare/EditorView.h b/src/Hare/Hare/EditorView.h index 638e987..22ec74a 100644 --- a/src/Hare/Hare/EditorView.h +++ b/src/Hare/Hare/EditorView.h @@ -1,7 +1,7 @@ #ifndef __EDITOR_VIEW_H__ #define __EDITOR_VIEW_H__ -#include +#include class BButton; class BCheckBox; diff --git a/src/Hare/Hare/EncoderListView.cpp b/src/Hare/Hare/EncoderListView.cpp index a32ccc3..9d6319e 100644 --- a/src/Hare/Hare/EncoderListView.cpp +++ b/src/Hare/Hare/EncoderListView.cpp @@ -1,27 +1,34 @@ +#include "EncoderListView.h" + #include -#include -#include -#include -#include + +#include +#include +#include +#include + #include #include + #include "AppDefs.h" #include "CheckMark.h" #include "CommandConstants.h" -#include "EncoderListView.h" #include "GUIStrings.h" #include "Settings.h" -EncoderListView::EncoderListView(BRect frame, BetterScrollView** container) : +EncoderListView::EncoderListView(BRect frame, BetterScrollView** container) + : ColumnListView(frame, (CLVContainerView**)container, "listView", B_FOLLOW_ALL, - B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE | B_NAVIGABLE_JUMP, - B_MULTIPLE_SELECTION_LIST, false, true, true, true, B_FANCY_BORDER) { + B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE | B_NAVIGABLE_JUMP, + B_MULTIPLE_SELECTION_LIST, false, true, true, true, B_FANCY_BORDER) +{ PRINT(("EncoderListView::EncoderListView(BRect)\n")); InitView(); } -EncoderListView::~EncoderListView() { +EncoderListView::~EncoderListView() +{ PRINT(("EncoderListView::~EncoderListView()\n")); delete checkMark; @@ -51,7 +58,8 @@ EncoderListView::~EncoderListView() { } void -EncoderListView::InitView() { +EncoderListView::InitView() +{ PRINT(("EncoderListView::InitView()\n")); checkMark = new CheckMark(); @@ -108,12 +116,14 @@ EncoderListView::InitView() { } void -EncoderListView::AttachedToWindow() { +EncoderListView::AttachedToWindow() +{ PRINT(("EncoderListView::AttachedToWindow()\n")); } void -EncoderListView::MessageReceived(BMessage* message) { +EncoderListView::MessageReceived(BMessage* message) +{ //PRINT(("EncoderListView::MessageReceived(BMessage*)\n")); switch (message->what) { @@ -123,13 +133,15 @@ EncoderListView::MessageReceived(BMessage* message) { } const BBitmap* -EncoderListView::GetCheckMark() { +EncoderListView::GetCheckMark() +{ return checkMark; } int sort_function(const CLVListItem* item1, const CLVListItem* item2, - int32 sort_key) { + int32 sort_key) +{ int result = -1; const char* item1Text = diff --git a/src/Hare/Hare/FileNamePatternView.cpp b/src/Hare/Hare/FileNamePatternView.cpp index 7f7f7e2..973e852 100644 --- a/src/Hare/Hare/FileNamePatternView.cpp +++ b/src/Hare/Hare/FileNamePatternView.cpp @@ -1,28 +1,36 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include "FileNamePatternView.h" + +#include +#include +#include +#include +#include +#include +#include +#include + #include + #include "AppDefs.h" #include "CommandConstants.h" -#include "FileNamePatternView.h" #include "GUIStrings.h" #include "Settings.h" -FileNamePatternView::FileNamePatternView(BRect frame) : BBox(frame) { +FileNamePatternView::FileNamePatternView(BRect frame) + : + BBox(frame) +{ PRINT(("FileNamePatternView::FileNamePatternView(BRect)\n")); } -FileNamePatternView::~FileNamePatternView() { +FileNamePatternView::~FileNamePatternView() +{ PRINT(("FileNamePatternView::~FileNamePatternView()\n")); } void -FileNamePatternView::InitView() { +FileNamePatternView::InitView() +{ PRINT(("FileNamePatternView::InitView()\n")); SetLabel(FILE_NAME_PATTERN_BOX_LABEL); @@ -136,14 +144,16 @@ FileNamePatternView::InitView() { } void -FileNamePatternView::MakeFocus(bool focused) { +FileNamePatternView::MakeFocus(bool focused) +{ PRINT(("FileNamePatternView::MakeFocused(bool)\n")); fileNamePatternTextControl->MakeFocus(focused); } void -FileNamePatternView::SetEnabled(bool value) { +FileNamePatternView::SetEnabled(bool value) +{ PRINT(("FileNamePatternView::SetEnabled(bool)\n")); fileNamePatternTextControl->SetEnabled(value); @@ -151,7 +161,8 @@ FileNamePatternView::SetEnabled(bool value) { } void -FileNamePatternView::AttachedToWindow() { +FileNamePatternView::AttachedToWindow() +{ PRINT(("FileNamePatternView::AttachedToWindow()\n")); InitView(); @@ -161,7 +172,8 @@ FileNamePatternView::AttachedToWindow() { } void -FileNamePatternView::GetPreferredSize(float* width, float* height) { +FileNamePatternView::GetPreferredSize(float* width, float* height) +{ PRINT(("FileNamePatternView::GetPreferredSize(float*,float*)\n")); int space = 6; @@ -172,7 +184,8 @@ FileNamePatternView::GetPreferredSize(float* width, float* height) { } void -FileNamePatternView::MessageReceived(BMessage* message) { +FileNamePatternView::MessageReceived(BMessage* message) +{ //PRINT(("FileNamePatternView::MessageReceived(BMessage*)\n")); BMessenger parentMessenger(Parent()); diff --git a/src/Hare/Hare/FileNamePatternView.h b/src/Hare/Hare/FileNamePatternView.h index 868dcf9..9f0a577 100644 --- a/src/Hare/Hare/FileNamePatternView.h +++ b/src/Hare/Hare/FileNamePatternView.h @@ -1,7 +1,7 @@ #ifndef __FILE_NAME_PATTERN_VIEW_H__ #define __FILE_NAME_PATTERN_VIEW_H__ -#include +#include class BButton; class BMessage; diff --git a/src/Hare/Hare/GenreList.cpp b/src/Hare/Hare/GenreList.cpp index a0d9f5c..9331997 100644 --- a/src/Hare/Hare/GenreList.cpp +++ b/src/Hare/Hare/GenreList.cpp @@ -1,7 +1,9 @@ -#include -#include #include "GenreList.h" +#include + +#include + #define NUM_GENRES 115 #define OTHER_INDEX 12 @@ -123,16 +125,19 @@ char* genre_list[] = { "Folklore" }; -GenreList::GenreList() { +GenreList::GenreList() +{ PRINT(("GenreList::GenreList()\n")); } -GenreList::~GenreList() { +GenreList::~GenreList() +{ PRINT(("GenreList::~GenreList()\n")); } char* -GenreList::Genre(int value) { +GenreList::Genre(int value) +{ PRINT(("GenreList::Genre(int)\n")); if ((value >= 0) && (value < NUM_GENRES)) { @@ -142,7 +147,8 @@ GenreList::Genre(int value) { } int -GenreList::Genre(const char* value) { +GenreList::Genre(const char* value) +{ PRINT(("GenreList::Genre(const char*)\n")); if (!value) { @@ -158,14 +164,16 @@ GenreList::Genre(const char* value) { } int -GenreList::NumGenres() { +GenreList::NumGenres() +{ PRINT(("GenreList::NumGenres()\n")); return NUM_GENRES; } int -GenreList::GenreSort(const void* g1, const void* g2) { +GenreList::GenreSort(const void* g1, const void* g2) +{ //PRINT(("GenreList::GenreSort()\n")); char* genre1 = *((char**) g1); diff --git a/src/Hare/Hare/ID3Tag.cpp b/src/Hare/Hare/ID3Tag.cpp index b0697d0..f8c7bf4 100644 --- a/src/Hare/Hare/ID3Tag.cpp +++ b/src/Hare/Hare/ID3Tag.cpp @@ -1,24 +1,30 @@ +#include "ID3Tag.h" + #include -#include + +#include #include -#include "ID3Tag.h" ID3Tag::ID3Tag(TagLib::FileRef* file, TagLib::Tag* tag, int tag_item) - : file(file), - tag(tag), - tag_item(tag_item), - value() { + : + file(file), + tag(tag), + tag_item(tag_item), + value() +{ PRINT(("ID3Tag::ID3Tag(TagLib::FileRef*, TagLib::Tag*, int)\n")); } -ID3Tag::~ID3Tag() { +ID3Tag::~ID3Tag() +{ PRINT(("ID3Tag::~ID3Tag()\n")); } const char * -ID3Tag::Value() { +ID3Tag::Value() +{ PRINT(("ID3Tag::Value()\n")); if (value.Length() == 0) @@ -28,7 +34,8 @@ ID3Tag::Value() { } void -ID3Tag::SetValue(const char* string) { +ID3Tag::SetValue(const char* string) +{ PRINT(("ID3Tag::SetValue(const char*)\n")); if (string) @@ -38,7 +45,8 @@ ID3Tag::SetValue(const char* string) { } status_t -ID3Tag::Read() { +ID3Tag::Read() +{ PRINT(("ID3Tag::Read()\n")); switch (tag_item) { @@ -79,7 +87,8 @@ ID3Tag::Read() { } status_t -ID3Tag::Write() { +ID3Tag::Write() +{ PRINT(("ID3Tag::Write()\n")); enum { diff --git a/src/Hare/Hare/ID3Tag.h b/src/Hare/Hare/ID3Tag.h index c5adb03..46669a9 100644 --- a/src/Hare/Hare/ID3Tag.h +++ b/src/Hare/Hare/ID3Tag.h @@ -2,7 +2,9 @@ #define __ID3_TAG_H__ #include + #include + #include #include diff --git a/src/Hare/Hare/ID3Tags.cpp b/src/Hare/Hare/ID3Tags.cpp index 1670dab..81e31b3 100644 --- a/src/Hare/Hare/ID3Tags.cpp +++ b/src/Hare/Hare/ID3Tags.cpp @@ -1,7 +1,9 @@ +#include "ID3Tags.h" + #include #include -#include +#include #include #include #include @@ -11,22 +13,23 @@ #include #include "GenreList.h" -#include "ID3Tags.h" //using namespace TagLib; ID3Tags::ID3Tags(const char* filename) - : AudioInfo(), - file(NULL), - tag(NULL), - artist(NULL), - album(NULL), - title(NULL), - year(NULL), - comment(NULL), - track(NULL), - genre(NULL), - write_on_exit(false) { + : + AudioInfo(), + file(NULL), + tag(NULL), + artist(NULL), + album(NULL), + title(NULL), + year(NULL), + comment(NULL), + track(NULL), + genre(NULL), + write_on_exit(false) +{ PRINT(("ID3Tags::ID3Tags(const char*): %s\n", filename)); status_t status = B_OK; @@ -104,7 +107,8 @@ ID3Tags::ID3Tags(const char* filename) } -ID3Tags::~ID3Tags() { +ID3Tags::~ID3Tags() +{ PRINT(("ID3Tags::~ID3Tags()\n")); if (write_on_exit) @@ -122,55 +126,63 @@ ID3Tags::~ID3Tags() { } bool -ID3Tags::HasID3Tags() { +ID3Tags::HasID3Tags() +{ PRINT(("ID3Tags::HasID3Tags()\n")); return true; } int -ID3Tags::CreateID3Tags() { +ID3Tags::CreateID3Tags() +{ PRINT(("ID3Tags::CreateID3Tags()\n")); } const char* -ID3Tags::Artist() { +ID3Tags::Artist() +{ PRINT(("ID3Tags::Artist()\n")); return artist->Value(); } const char* -ID3Tags::Album() { +ID3Tags::Album() +{ PRINT(("ID3Tags::Album()\n")); return album->Value(); } const char* -ID3Tags::Title() { +ID3Tags::Title() +{ PRINT(("ID3Tags::Title()\n")); return title->Value(); } const char* -ID3Tags::Year() { +ID3Tags::Year() +{ PRINT(("ID3Tags::Year()\n")); return year->Value(); } const char* -ID3Tags::Comment() { +ID3Tags::Comment() +{ PRINT(("ID3Tags::Comment()\n")); return comment->Value(); } const char* -ID3Tags::Track() { // XXX +ID3Tags::Track() // XXX +{ PRINT(("ID3Tags::Track()\n")); return track->Value(); @@ -187,7 +199,8 @@ ID3Tags::Track() { // XXX } const char* -ID3Tags::Genre() { // XXX +ID3Tags::Genre() // XXX +{ PRINT(("ID3Tags::Genre()\n")); return genre->Value(); @@ -203,42 +216,48 @@ ID3Tags::Genre() { // XXX } void -ID3Tags::SetArtist(const char* value) { +ID3Tags::SetArtist(const char* value) +{ PRINT(("ID3Tags::SetArtist(const char*)\n")); artist->SetValue(value); } void -ID3Tags::SetAlbum(const char* value) { +ID3Tags::SetAlbum(const char* value) +{ PRINT(("ID3Tags::SetAlbum(const char*)\n")); album->SetValue(value); } void -ID3Tags::SetTitle(const char* value) { +ID3Tags::SetTitle(const char* value) +{ PRINT(("ID3Tags::SetTitle(const char*)\n")); title->SetValue(value); } void -ID3Tags::SetYear(const char* value) { +ID3Tags::SetYear(const char* value) +{ PRINT(("ID3Tags::SetYear(const char*)\n")); year->SetValue(value); } void -ID3Tags::SetComment(const char* value) { +ID3Tags::SetComment(const char* value) +{ PRINT(("ID3Tags::SetComment(const char*)\n")); comment->SetValue(value); } void -ID3Tags::SetTrack(const char* value) { +ID3Tags::SetTrack(const char* value) +{ PRINT(("ID3Tags::SetTrack(const char*)\n")); int trk = 0; @@ -259,7 +278,8 @@ ID3Tags::SetTrack(const char* value) { } void -ID3Tags::SetGenre(const char* value) { +ID3Tags::SetGenre(const char* value) +{ PRINT(("ID3Tags::SetGenre(const char*)\n")); // char val = GenreList::Genre(value); @@ -268,56 +288,64 @@ ID3Tags::SetGenre(const char* value) { } status_t -ID3Tags::ReadArtist() { +ID3Tags::ReadArtist() +{ PRINT(("ID3Tags::ReadArtist()\n")); return artist->Read(); } status_t -ID3Tags::ReadAlbum() { +ID3Tags::ReadAlbum() +{ PRINT(("ID3Tags::ReadAlbum()\n")); return album->Read(); } status_t -ID3Tags::ReadTitle() { +ID3Tags::ReadTitle() +{ PRINT(("ID3Tags::ReadTitle()\n")); return title->Read(); } status_t -ID3Tags::ReadYear() { +ID3Tags::ReadYear() +{ PRINT(("ID3Tags::ReadYear()\n")); return year->Read(); } status_t -ID3Tags::ReadComment() { +ID3Tags::ReadComment() +{ PRINT(("ID3Tags::ReadComment()\n")); return comment->Read(); } status_t -ID3Tags::ReadTrack() { +ID3Tags::ReadTrack() +{ PRINT(("ID3Tags::ReadTrack()\n")); return track->Read(); } status_t -ID3Tags::ReadGenre() { +ID3Tags::ReadGenre() +{ PRINT(("ID3Tags::ReadGenre()\n")); return genre->Read(); } status_t -ID3Tags::Write() { +ID3Tags::Write() +{ PRINT(("ID3Tags::Write()\n")); write_on_exit = true; @@ -326,7 +354,8 @@ ID3Tags::Write() { } status_t -ID3Tags::WriteArtist() { +ID3Tags::WriteArtist() +{ PRINT(("ID3Tags::WriteArtist()\n")); write_on_exit = true; @@ -335,7 +364,8 @@ ID3Tags::WriteArtist() { } status_t -ID3Tags::WriteAlbum() { +ID3Tags::WriteAlbum() +{ PRINT(("ID3Tags::WriteAlbum()\n")); write_on_exit = true; @@ -344,7 +374,8 @@ ID3Tags::WriteAlbum() { } status_t -ID3Tags::WriteTitle() { +ID3Tags::WriteTitle() +{ PRINT(("ID3Tags::WriteTitle()\n")); write_on_exit = true; @@ -353,7 +384,8 @@ ID3Tags::WriteTitle() { } status_t -ID3Tags::WriteYear() { +ID3Tags::WriteYear() +{ PRINT(("ID3Tags::WriteYear()\n")); write_on_exit = true; @@ -362,7 +394,8 @@ ID3Tags::WriteYear() { } status_t -ID3Tags::WriteComment() { +ID3Tags::WriteComment() +{ PRINT(("ID3Tags::WriteComment()\n")); write_on_exit = true; @@ -371,7 +404,8 @@ ID3Tags::WriteComment() { } status_t -ID3Tags::WriteTrack() { +ID3Tags::WriteTrack() +{ PRINT(("ID3Tags::WriteTrack()\n")); write_on_exit = true; @@ -380,7 +414,8 @@ ID3Tags::WriteTrack() { } status_t -ID3Tags::WriteGenre() { +ID3Tags::WriteGenre() +{ PRINT(("ID3Tags::WriteGenre()\n")); write_on_exit = true; diff --git a/src/Hare/Hare/Settings.cpp b/src/Hare/Hare/Settings.cpp index 3493a53..9d174db 100644 --- a/src/Hare/Hare/Settings.cpp +++ b/src/Hare/Hare/Settings.cpp @@ -1,25 +1,32 @@ +#include "Settings.h" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include + #include "AppDefs.h" #include "CommandConstants.h" -#include "Settings.h" Settings* settings = 0; #define DEFAULT_ENCODER "MP3 GoGo" #define DEFAULT_NUMBER_OF_SORT_KEYS 0 -Settings::Settings() : BArchivable() { +Settings::Settings() + : + BArchivable() +{ PRINT(("Settings::Settings()\n")); encoding = false; @@ -60,7 +67,10 @@ Settings::Settings() : BArchivable() { settings = this; } -Settings::Settings(BMessage* archive) : BArchivable(archive) { +Settings::Settings(BMessage* archive) + : + BArchivable(archive) +{ PRINT(("Settings::Settings(BMessage*)\n")); status_t status; @@ -161,14 +171,16 @@ Settings::Settings(BMessage* archive) : BArchivable(archive) { settings = this; } -Settings::~Settings() { +Settings::~Settings() +{ PRINT(("Settings::~Settings()\n")); SaveSettings(); } BArchivable* -Settings::Instantiate(BMessage* archive) { +Settings::Instantiate(BMessage* archive) +{ PRINT(("Settings::Instantiate(BMessage*)\n")); BArchivable* result = NULL; @@ -181,7 +193,8 @@ Settings::Instantiate(BMessage* archive) { } status_t -Settings::Archive(BMessage* archive, bool deep) const { +Settings::Archive(BMessage* archive, bool deep) const +{ PRINT(("Settings::Archive(BMessage*,bool)\n")); status_t status = B_OK; @@ -245,7 +258,8 @@ Settings::Archive(BMessage* archive, bool deep) const { } void -Settings::OpenSettings() { +Settings::OpenSettings() +{ PRINT(("Settings::GetInstance()\n")); BPath path; @@ -267,7 +281,8 @@ Settings::OpenSettings() { } void -Settings::SaveSettings() { +Settings::SaveSettings() +{ PRINT(("Settings::SaveWindow()\n")); BPath path; @@ -286,24 +301,28 @@ Settings::SaveSettings() { } bool -Settings::IsEncoding() { +Settings::IsEncoding() +{ return encoding; } void -Settings::SetEncoding(bool value) { +Settings::SetEncoding(bool value) +{ encoding = value; } AEEncoder* -Settings::Encoder() { +Settings::Encoder() +{ PRINT(("Settings::Encoder()\n")); return encoder; } void -Settings::SetEncoder(AEEncoder* value) { +Settings::SetEncoder(AEEncoder* value) +{ PRINT(("Settings::SetEncoder()\n")); if (!encoding) { @@ -317,14 +336,16 @@ Settings::SetEncoder(AEEncoder* value) { } const char* -Settings::EncoderName() { +Settings::EncoderName() +{ PRINT(("Settings::EncoderName()\n")); return encoderName; } void -Settings::SetEncoderName(const char* value) { +Settings::SetEncoderName(const char* value) +{ PRINT(("Settings::SetEncoderName(const char*)\n")); if (value && !encoding) { @@ -333,14 +354,16 @@ Settings::SetEncoderName(const char* value) { } int32* -Settings::ColumnDisplayOrder() { +Settings::ColumnDisplayOrder() +{ PRINT(("Settings::ColumnDisplayOrder()\n")); return columnDisplayOrder; } void -Settings::SetColumnDisplayOrder(const int32* value) { +Settings::SetColumnDisplayOrder(const int32* value) +{ PRINT(("Settings::SetColumnDisplayOrder(const int32*)\n")); if (!encoding) { @@ -351,14 +374,16 @@ Settings::SetColumnDisplayOrder(const int32* value) { } int32 -Settings::NumberOfSortKeys() { +Settings::NumberOfSortKeys() +{ PRINT(("Settings::NumberOfSortKeys()\n")); return numberOfSortKeys; } void -Settings::SetNumberOfSortKeys(int32 value) { +Settings::SetNumberOfSortKeys(int32 value) +{ PRINT(("Settings::SetNumberOfSortKeys(int32)\n")); if (!encoding) { @@ -367,14 +392,16 @@ Settings::SetNumberOfSortKeys(int32 value) { } int32* -Settings::SortKeys() { +Settings::SortKeys() +{ PRINT(("Settings::SortKeys()\n")); return sortKeys; } void -Settings::SetSortKeys(const int32* value) { +Settings::SetSortKeys(const int32* value) +{ PRINT(("Settings::SetSortKeys(const int32*)\n")); if (!encoding) { @@ -385,14 +412,16 @@ Settings::SetSortKeys(const int32* value) { } CLVSortMode* -Settings::SortModes() { +Settings::SortModes() +{ PRINT(("Settings::SortModes()\n")); return sortModes; } void -Settings::SetSortModes(const CLVSortMode* value) { +Settings::SetSortModes(const CLVSortMode* value) +{ PRINT(("Settings::SetSortModes(const CLVSortMode*)\n")); if (!encoding) { @@ -403,14 +432,16 @@ Settings::SetSortModes(const CLVSortMode* value) { } bool* -Settings::ColumnsShown() { +Settings::ColumnsShown() +{ PRINT(("Settings::ColumnsShown()\n")); return columnsShown; } void -Settings::SetColumnsShown(const bool* value) { +Settings::SetColumnsShown(const bool* value) +{ PRINT(("Settings::SetColumnsShown(const bool*)\n")); if (!encoding) { @@ -421,14 +452,16 @@ Settings::SetColumnsShown(const bool* value) { } float* -Settings::ColumnWidths() { +Settings::ColumnWidths() +{ PRINT(("Settings::ColumnWidths()\n")); return columnWidths; } void -Settings::SetColumnWidths(const float* value) { +Settings::SetColumnWidths(const float* value) +{ PRINT(("Settings::SetColumnWidths(const float*)\n")); if (!encoding) { @@ -439,14 +472,16 @@ Settings::SetColumnWidths(const float* value) { } const char* -Settings::AddOnsDirectory() { +Settings::AddOnsDirectory() +{ PRINT(("Settings::AddOnsDirectory()\n")); return addonDirectory; } void -Settings::PrintToStream() { +Settings::PrintToStream() +{ PRINT(("\n")); PRINT(("\tENCODER NAME = %s\n", encoderName)); PRINT(("\tADD_ON_DIR = %s\n", addonDirectory)); diff --git a/src/Hare/Hare/Settings.h b/src/Hare/Hare/Settings.h index ad1396c..c6a86bf 100644 --- a/src/Hare/Hare/Settings.h +++ b/src/Hare/Hare/Settings.h @@ -1,8 +1,10 @@ #ifndef __PREFERENCES_H__ #define __PREFERENCES_H__ -#include +#include + #include + #include "CommandConstants.h" class AEEncoder; diff --git a/src/Hare/Hare/StatusBarFilter.cpp b/src/Hare/Hare/StatusBarFilter.cpp index 694c290..edf4b6e 100644 --- a/src/Hare/Hare/StatusBarFilter.cpp +++ b/src/Hare/Hare/StatusBarFilter.cpp @@ -1,16 +1,22 @@ -#include -#include -#include +#include "StatusBarFilter.h" + +#include +#include +#include + #include + #include "Settings.h" -#include "StatusBarFilter.h" -StatusBarFilter::StatusBarFilter() : - BMessageFilter(B_PROGRAMMED_DELIVERY, B_LOCAL_SOURCE) { +StatusBarFilter::StatusBarFilter() + : + BMessageFilter(B_PROGRAMMED_DELIVERY, B_LOCAL_SOURCE) +{ } filter_result -StatusBarFilter::Filter(BMessage* message, BHandler** target) { +StatusBarFilter::Filter(BMessage* message, BHandler** target) +{ filter_result result = B_DISPATCH_MESSAGE; switch (message->what) { diff --git a/src/Hare/Hare/StatusBarFilter.h b/src/Hare/Hare/StatusBarFilter.h index 0a57833..36ed185 100644 --- a/src/Hare/Hare/StatusBarFilter.h +++ b/src/Hare/Hare/StatusBarFilter.h @@ -1,7 +1,7 @@ #ifndef __STATUS_BAR_FILTER_H__ #define __STATUS_BAR_FILTER_H__ -#include +#include class BHandler; class BMessage; diff --git a/src/Hare/Hare/VolumeMenuItem.cpp b/src/Hare/Hare/VolumeMenuItem.cpp index d9fafa8..c0079b8 100644 --- a/src/Hare/Hare/VolumeMenuItem.cpp +++ b/src/Hare/Hare/VolumeMenuItem.cpp @@ -1,9 +1,13 @@ -#include -#include -#include #include "VolumeMenuItem.h" -VolumeMenuItem::VolumeMenuItem(BVolume* volume) : BMenuItem("", NULL) { +#include +#include +#include + +VolumeMenuItem::VolumeMenuItem(BVolume* volume) + : + BMenuItem("", NULL) +{ PRINT(("VolumeMenuItem::VolumeMenuItem(BVolume*)\n")); char volume_name[B_FILE_NAME_LENGTH]; @@ -12,19 +16,24 @@ VolumeMenuItem::VolumeMenuItem(BVolume* volume) : BMenuItem("", NULL) { device = volume->Device(); } -VolumeMenuItem::VolumeMenuItem(fs_info* info) : BMenuItem("", NULL) { +VolumeMenuItem::VolumeMenuItem(fs_info* info) + : + BMenuItem("", NULL) +{ PRINT(("VolumeMenuItem::VolumeMenuItem(fs_info*)\n")); SetLabel(info->volume_name); device = info->dev; } -VolumeMenuItem::~VolumeMenuItem() { +VolumeMenuItem::~VolumeMenuItem() +{ PRINT(("VolumeMenuItem::~VolumeMenuItem()\n")); } dev_t -VolumeMenuItem::GetDevice() { +VolumeMenuItem::GetDevice() +{ PRINT(("VolumeMenuItem::GetDevice()\n")); return device; diff --git a/src/Hare/Hare/VolumeMenuItem.h b/src/Hare/Hare/VolumeMenuItem.h index 6cff601..0c6507e 100644 --- a/src/Hare/Hare/VolumeMenuItem.h +++ b/src/Hare/Hare/VolumeMenuItem.h @@ -1,7 +1,7 @@ #ifndef __VOLUME_MENU_ITEM_H__ #define __VOLUME_MENU_ITEM_H__ -#include +#include class BMessage; class BVolume;