Changeset 800
- Timestamp:
- 2002-09-27 23:10:08 (6 years ago)
- Files:
-
- mb_tagger/trunk/analyzer.cpp (modified) (7 diffs)
- mb_tagger/trunk/defs.h (modified) (6 diffs)
- mb_tagger/trunk/filecache.cpp (modified) (1 diff)
- mb_tagger/trunk/filecache.h (modified) (1 diff)
- mb_tagger/trunk/installer/mbtagger-setup.wse (modified) (1 diff)
- mb_tagger/trunk/main.cpp (modified) (15 diffs)
- mb_tagger/trunk/main.dfm (modified) (2 diffs)
- mb_tagger/trunk/main.h (modified) (4 diffs)
- mb_tagger/trunk/mbid3.cpp (modified) (3 diffs)
- mb_tagger/trunk/mbtagger.bpr (modified) (5 diffs)
- mb_tagger/trunk/mbtagger.cpp (modified) (1 diff)
- mb_tagger/trunk/optionsdialog.cpp (modified) (2 diffs)
- mb_tagger/trunk/optionsdialog.dfm (modified) (3 diffs)
- mb_tagger/trunk/optionsdialog.h (modified) (1 diff)
- mb_tagger/trunk/preferences.cpp (modified) (1 diff)
- mb_tagger/trunk/rc/recognized.bmp (modified) (previous)
- mb_tagger/trunk/trmgen.cpp (deleted)
- mb_tagger/trunk/trmgenbase.h (deleted)
- mb_tagger/trunk/trmwav.cpp (deleted)
- mb_tagger/trunk/trmwav.h (deleted)
- mb_tagger/trunk/tview.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
mb_tagger/trunk/analyzer.cpp
r799 r800 6 6 #include "analyzer.h" 7 7 #include "main.h" 8 #include "trm gen.h"8 #include "trm.h" 9 9 #include "trmwav.h" 10 10 #include "mbid3.h" … … 93 93 data.trackId = ""; 94 94 fileCache->setData(index, eData, data); 95 95 96 96 fileCache->getData(index, eId3, data); 97 97 data.trackId = ""; … … 114 114 ext = ext.UpperCase(); 115 115 if (ext == ".MP3") 116 gen = new TRMGenerator(fileName); 116 { 117 char ascii_sig[37]; 118 int ret; 119 120 ret = MP3_generateTRM(fileName.c_str(), ascii_sig); 121 if (ret == TRM_OK) 122 trm = ascii_sig; 123 124 if (trm.IsEmpty()) 125 { 126 parent->setStatus("Failed to generate trm from " + fileName); 127 fileCache->setStatus(index, eAnalyzedError); 128 fileCache->setErrorString(index, "Failed to generate TRM id."); 129 } 130 } 131 else 132 if (ext == ".OGG") 133 { 134 char ascii_sig[37]; 135 int ret; 136 137 ret = OggVorbis_generateTRM(fileName.c_str(), ascii_sig); 138 if (ret == TRM_OK) 139 trm = ascii_sig; 140 141 if (trm.IsEmpty()) 142 { 143 parent->setStatus("Failed to generate trm from " + fileName); 144 fileCache->setStatus(index, eAnalyzedError); 145 fileCache->setErrorString(index, "Failed to generate TRM id."); 146 } 147 } 117 148 else 118 149 if (ext == ".WAV") 119 gen = new TRMWavGenerator(fileName); 150 { 151 char ascii_sig[37]; 152 int ret; 153 154 ret = Wav_generateTRM(fileName.c_str(), ascii_sig); 155 if (ret == TRM_OK) 156 trm = ascii_sig; 157 158 if (trm.IsEmpty()) 159 { 160 parent->setStatus("Failed to generate trm from " + fileName); 161 fileCache->setStatus(index, eAnalyzedError); 162 fileCache->setErrorString(index, "Failed to generate TRM id."); 163 } 164 } 120 165 else 121 166 { 122 parent->setStatus(ext + " is not a supported filetype."); 167 AnsiString err; 168 err = ext + AnsiString(" is not a supported filetype."); 169 parent->setStatus(err); 123 170 fileCache->setStatus(index, eAnalyzedError); 124 } 125 if (gen) 126 { 127 if (gen->Generate(trm)) 171 fileCache->setErrorString(index, err); 172 } 173 174 if (!trm.IsEmpty()) 175 { 176 AnsiString f = trm.SubString(15, 1); 177 if (trm.SubString(15, 1) != AnsiString("4")) 178 { 179 AnsiString err; 180 181 err = AnsiString("Unable to retrieve TRM from fingerprint server."); 182 parent->setStatus(err); 183 fileCache->setStatus(index, eAnalyzedError); 184 fileCache->setErrorString(index, err); 185 } 186 else 128 187 { 129 188 fileCache->setTrm(index, trm); … … 134 193 MBLookup(index, trm); 135 194 } 136 else137 {138 AnsiString err;139 140 gen->GetError(err);141 parent->setStatus(err);142 fileCache->setStatus(index, eAnalyzedError);143 }144 delete gen;145 195 } 146 196 } … … 183 233 { 184 234 ID3 id3(false, false); 185 AnsiString fileName ;235 AnsiString fileName, trm; 186 236 Metadata data; 187 237 … … 192 242 else 193 243 { 244 fileCache->getTrm(index, trm); 245 if (trm != AnsiString(ANALYZER_REDO_STRING) && !data.fileTrm.IsEmpty()) 246 fileCache->setTrm(index, data.fileTrm); 247 194 248 fileCache->setData(index, eId3, data); 195 249 fileCache->setData(index, eData, data); … … 198 252 } 199 253 254 mb_tagger/trunk/defs.h
r798 r800 1 1 #ifndef DEFS_H 2 2 #define DEFS_H 3 4 #define MB_TAGGER_NAME "MusicBrainz Tagger" 5 #define MB_TAGGER_VERSION "0.3.0" 3 6 4 7 struct Metadata … … 9 12 int trackNum; 10 13 AnsiString trackId; 14 AnsiString fileTrm; 11 15 12 16 Metadata::Metadata(void) { trackNum = 0; }; … … 18 22 trackNum = other.trackNum; 19 23 trackId = other.trackId; 24 fileTrm = other.fileTrm; 20 25 21 26 return *this; 22 27 }; 23 28 24 29 bool operator==(const Metadata &other) 25 30 { … … 28 33 track == other.track && 29 34 trackNum == other.trackNum && 30 trackId == other.trackId) 35 trackId == other.trackId && 36 fileTrm == other.fileTrm) 31 37 return true; 32 38 … … 40 46 track = ""; 41 47 trackNum = 0; 48 fileTrm = ""; 42 49 } 43 50 }; … … 67 74 AnsiString trm; 68 75 Metadata id3, data; 76 AnsiString errorString; 69 77 }; 70 78 mb_tagger/trunk/filecache.cpp
r798 r800 183 183 } 184 184 185 void FileCache::getErrorString(int index, AnsiString &error) 186 { 187 error = ""; 188 189 mutex->Acquire(); 190 if (index >= 0 && index < cache->Count) 191 { 192 error = ((FileInfo *)cache->Items[index])->errorString; 193 } 194 mutex->Release(); 195 } 196 197 void FileCache::setErrorString(int index, const AnsiString &error) 198 { 199 mutex->Acquire(); 200 if (index >= 0 && index < cache->Count) 201 { 202 ((FileInfo *)cache->Items[index])->errorString = error; 203 } 204 mutex->Release(); 205 } 206 185 207 void FileCache::getTrm(int index, AnsiString &trm) 186 208 { mb_tagger/trunk/filecache.h
r798 r800 35 35 void setFileName(int index, const AnsiString &fileName); 36 36 37 void setErrorString(int index, const AnsiString &error); 38 void getErrorString(int index, AnsiString &error); 39 37 40 void setTrm(int index, const AnsiString &trm); 38 41 void getTrm(int index, AnsiString &trm); mb_tagger/trunk/installer/mbtagger-setup.wse
r792 r800 1195 1195 end 1196 1196 item: Install File 1197 Source=d:\musicbrainz\mb_tagger\madtrmdll.dll 1198 Destination=%MAINDIR%\madtrmdll.dll 1199 Flags=0000000010000010 1200 end 1201 item: Install File 1197 1202 Source=d:\musicbrainz\mb_tagger\Authors 1198 1203 Destination=%MAINDIR%\Authors mb_tagger/trunk/main.cpp
r799 r800 257 257 } 258 258 } 259 259 260 if (strstr(url.c_str(), "showalbum.html") || 260 261 strstr(url.c_str(), "showartist.html")) … … 308 309 unlink(url.c_str()); 309 310 311 if (strstr(url.c_str(), "showalbum.html") || 312 strstr(url.c_str(), "showartist.html")) 313 { 314 if (strstr(url.c_str(), "mbt=1") == NULL) 315 webBrowser->Navigate(WideString(url)); 316 } 317 310 318 setStatus("Document complete."); 311 319 } … … 321 329 void __fastcall TMBTaggerForm::optionsMenuItemClick(TObject *Sender) 322 330 { 331 323 332 optionsButtonClick(Sender); 324 333 } … … 588 597 url = AnsiString(base); 589 598 590 if (strlen(artistEdit->Text.c_str()) > 2)599 if (strlen(artistEdit->Text.c_str()) > 1) 591 600 { 592 601 encoded = artistEdit->Text; … … 845 854 void __fastcall TMBTaggerForm::removePath(AnsiString &fileName) 846 855 { 847 char file[MAX_PATH], ext[ 10];856 char file[MAX_PATH], ext[MAX_PATH]; 848 857 849 858 fnsplit(fileName.c_str(), NULL, NULL, file, ext); … … 869 878 TTreeNode *node; 870 879 871 if (!userCheck())872 return;873 874 880 treeView->Selected = NULL; 875 881 currentIndex = -1; … … 894 900 fileCache->getFileName(index, fileName); 895 901 fileCache->getTrm(index, trm); 902 data.fileTrm = trm; 896 903 897 904 fileOnly = fileName; … … 1233 1240 //--------------------------------------------------------------------------- 1234 1241 1242 void __fastcall TMBTaggerForm::enableButtonsPost(void) 1243 { 1244 // This function exists so that we can set the button states properly 1245 // during a treeView change. If we do that update DURING the change 1246 // the treeView control crashes. 1247 PostMessage(Handle, MB_ENABLEBUTTONS, 0, 0); 1248 } 1249 1250 //--------------------------------------------------------------------------- 1251 1252 void __fastcall TMBTaggerForm::enableButtonsMessage(TMessage &Message) 1253 { 1254 enableButtons(); 1255 } 1256 1257 //--------------------------------------------------------------------------- 1258 1235 1259 void __fastcall TMBTaggerForm::enableButtons(void) 1236 1260 { … … 1291 1315 clearCurrentSelection(); 1292 1316 treeView->Selected = NULL; 1293 enableButtons ();1317 enableButtonsPost(); 1294 1318 return; 1295 1319 } … … 1318 1342 currentIndex = index; 1319 1343 1320 enableButtons ();1344 enableButtonsPost(); 1321 1345 } 1322 1346 … … 1348 1372 extList = new TList; 1349 1373 extList->Add(new AnsiString(".mp3")); 1374 extList->Add(new AnsiString(".wav")); 1350 1375 DirSearch search(extList, this); 1351 1376 … … 1405 1430 1406 1431 status = tview->getNodeType(node); 1407 identifyAgainItem->Enabled = (status == eSaved);1408 identifyAllAgainItem->Enabled = (status == eSaved);1432 identifyAgainItem->Enabled = (status != ePending && status != eUnrecognized); 1433 identifyAllAgainItem->Enabled = (status != ePending && status != eUnrecognized); 1409 1434 1410 1435 treeViewMenu->Popup(out.x, out.y); … … 1457 1482 fileCache->getData((int)node->Data, eId3, data); 1458 1483 fileCache->getFileName((int)node->Data, fileName); 1459 1460 hint = fileName + "\r\nID3: "; 1461 hint += data.artist.IsEmpty() ? AnsiString("<blank>") : data.artist; 1462 hint += ", "; 1463 hint += data.album.IsEmpty() ? AnsiString("<blank>") : data.album; 1464 hint += ", "; 1465 hint += data.trackNum == 0 ? AnsiString("?") : AnsiString(data.trackNum); 1466 hint += " - "; 1467 hint += data.track.IsEmpty() ? AnsiString("<blank>") : data.track; 1468 1484 status = fileCache->getStatus((int)node->Data); 1485 1486 if (status == eError) 1487 { 1488 AnsiString err; 1489 1490 fileCache->getErrorString((int)node->Data, err); 1491 hint = "Error: " + err; 1492 } 1493 else 1494 { 1495 hint = fileName + "\r\nID3: "; 1496 hint += data.artist.IsEmpty() ? AnsiString("<blank>") : data.artist; 1497 hint += ", "; 1498 hint += data.album.IsEmpty() ? AnsiString("<blank>") : data.album; 1499 hint += ", "; 1500 hint += data.trackNum == 0 ? AnsiString("?") : AnsiString(data.trackNum); 1501 hint += " - "; 1502 hint += data.track.IsEmpty() ? AnsiString("<blank>") : data.track; 1503 } 1504 1469 1505 treeView->Hint = hint; 1470 1506 treeView->ShowHint = true; … … 1587 1623 submitInfo.remove(data.trackId); 1588 1624 1589 data. trackId = "";1625 data.clear(); 1590 1626 trm = ANALYZER_REDO_STRING; 1627 fileCache->setData((int)node->Data, eId3, data); 1591 1628 fileCache->setData((int)node->Data, eData, data); 1592 1629 fileCache->setTrm((int)node->Data, trm); 1630 fileCache->setErrorString((int)node->Data, AnsiString("")); 1593 1631 tview->setStatus((int)node->Data, status, ePending); 1594 1632 analyzer->wake(); … … 1713 1751 { 1714 1752 submitTrms(); 1715 } 1716 1717 1718 1719 1753 enableButtons(); 1754 } 1755 mb_tagger/trunk/main.dfm
r799 r800 4 4 Anchors = [akTop, akRight] 5 5 AutoScroll = False 6 BorderIcons = [biSystemMenu, biMinimize]7 6 Caption = 'MusicBrainz Tagger' 8 7 ClientHeight = 769 … … 1310 1309 DefaultExt = '*.mp3' 1311 1310 Filter = 1312 'MP3 Files (.mp3)|*.mp3| WAV Files (.wav)|*.wav|All Files (*.*)|*.' +1313 ' *'1311 'MP3 Files (.mp3)|*.mp3|Ogg/Vorbis Files (*.ogg)|*.ogg|WAV Files ' + 1312 '(.wav)|*.wav|All Files (*.*)|*.*' 1314 1313 Options = [ofHideReadOnly, ofAllowMultiSelect, ofEnableSizing] 1315 1314 Left = 620 mb_tagger/trunk/main.h
r798 r800 29 29 #define MB_WAKE (WM_USER + 2) 30 30 #define MB_SUBMIT (WM_USER + 3) 31 #define MB_ENABLEBUTTONS (WM_USER + 4) 31 32 32 33 //--------------------------------------------------------------------------- … … 108 109 109 110 void __fastcall lookupNotify(TMessage &Message); 111 void __fastcall enableButtonsMessage(TMessage &Message); 110 112 void __fastcall openButtonClick(TObject *Sender); 111 113 void __fastcall lookupButtonClick(TObject *Sender); … … 160 162 bool __fastcall CreateLoginPage(const char *fileName, const char *url); 161 163 char * __fastcall EscapeUrl(const char *url); 164 void __fastcall enableButtonsPost(void); 162 165 163 166 TImage *image; … … 183 186 MESSAGE_HANDLER(MB_WAKE, TMessage, processWakeSignal); 184 187 MESSAGE_HANDLER(MB_SUBMIT, TMessage, processSubmitMessage); 188 MESSAGE_HANDLER(MB_ENABLEBUTTONS, TMessage, enableButtonsMessage); 185 189 END_MESSAGE_MAP(TForm) 186 190 mb_tagger/trunk/mbid3.cpp
r798 r800 8 8 #include "analyzer.h" 9 9 #include "main.h" 10 #include "trmgen.h"11 10 #include "mbid3.h" 12 11 … … 143 142 } 144 143 145 delete pData;144 delete [] pData; 146 145 ID3Tag_Delete(pTag); 147 146 … … 156 155 ID3Tag *pTag; 157 156 ID3Frame *pFrame; 158 char *pData;157 char pData[255]; 159 158 char *ptr; 160 159 ID3Field *pField; mb_tagger/trunk/mbtagger.bpr
r799 r800 5 5 <VERSION value="BCB.05.03"/> 6 6 <PROJECT value="mbtagger.exe"/> 7 <OBJFILES value="mbtagger.obj main.obj preferences.obj optionsdialog.obj trmgen.obj 8 analyzer.obj filecache.obj lookup.obj mbid3.obj lookupdialog.obj 9 ..\xingmp3\src\isbt.obj ..\xingmp3\src\csbt.obj ..\xingmp3\src\cup.obj 10 ..\xingmp3\src\cupl3.obj ..\xingmp3\src\cwinm.obj ..\xingmp3\src\dec8.obj 11 ..\xingmp3\src\hwin.obj ..\xingmp3\src\icdct.obj ..\xingmp3\src\cdct.obj 12 ..\xingmp3\src\iup.obj ..\xingmp3\src\iwinm.obj ..\xingmp3\src\l3dq.obj 13 ..\xingmp3\src\l3init.obj ..\xingmp3\src\mdct.obj ..\xingmp3\src\mhead.obj 14 ..\xingmp3\src\msis.obj ..\xingmp3\src\uph.obj ..\xingmp3\src\upsf.obj 15 ..\xingmp3\src\wcvt.obj dirsearch.obj debug.obj tview.obj submit.obj 16 trmwav.obj"/> 17 <RESFILES value="mbtagger.res rc\resources.res"/> 7 <OBJFILES value="obj\mbtagger.obj obj\main.obj obj\preferences.obj obj\optionsdialog.obj 8 obj\analyzer.obj obj\filecache.obj obj\lookup.obj obj\mbid3.obj 9 obj\lookupdialog.obj obj\dirsearch.obj obj\debug.obj obj\tview.obj 10 obj\submit.obj"/> 11 <RESFILES value="mbtagger.res obj\resources.res"/> 18 12 <IDLFILES value=""/> 19 13 <IDLGENFILES value=""/> 20 14 <DEFFILE value=""/> 21 15 <RESDEPEN value="$(RESFILES) main.dfm optionsdialog.dfm lookupdialog.dfm"/> 22 <LIBFILES value="musicbrainz.lib id3lib.lib"/>16 <LIBFILES value="musicbrainz.lib trm.lib id3lib.lib"/> 23 17 <LIBRARIES value="bcbie50.lib Vclx50.lib Vcl50.lib"/> 24 18 <SPARELIBS value="Vcl50.lib Vclx50.lib bcbie50.lib"/> 25 19 <PACKAGES value="Vcl50.bpi"/> 26 <PATHCPP value=".; ..\xingmp3\src"/>20 <PATHCPP value=".;"/> 27 21 <PATHPAS value=".;"/> 28 22 <PATHRC value=".;rc"/> … … 31 25 <RELEASELIBPATH value="$(BCB)\lib\release"/> 32 26 <LINKER value="tlink32"/> 33 <USERDEFINES value="NO_WIN32_LEAN_AND_MEAN;WIN32; _DEBUG"/>27 <USERDEFINES value="NO_WIN32_LEAN_AND_MEAN;WIN32;ID3LIB_LINKOPTION=3"/> 34 28 <SYSDEFINES value="NO_STRICT"/> 35 29 <MAINSOURCE value="mbtagger.cpp"/> 36 <INCLUDEPATH value="rc\;rc;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\include;$(BCB)\include\vcl;..\ xingmp3\src;..\id3lib\include;..\mb_client\lib"/>30 <INCLUDEPATH value="rc\;rc;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\include;$(BCB)\include\vcl;..\trm;..\id3lib\include;..\mb_client\lib"/> 37 31 <LIBPATH value="rc\;rc;"C:\Program Files\Borland\CBuilder5\Bin\";..\xingmp3\src;xingmp3;$(BCB)\lib\obj;$(BCB)\lib"/> 38 32 <WARNINGS value="-w-par"/> … … 40 34 <OPTIONS> 41 35 <IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/> 42 <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c 43 -tW -tWM"/> 44 <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> 36 <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/> 37 <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -JPHNE -M"/> 45 38 <RFLAGS value=""/> 46 <AFLAGS value="/mx /w2 /z i"/>47 <LFLAGS value="- D"" -aa -Tpe -x -Gn -v"/>39 <AFLAGS value="/mx /w2 /zn"/> 40 <LFLAGS value="-Iobj -D"" -aa -Tpe -x -Gn"/> 48 41 </OPTIONS> 49 42 <LINKER> … … 81 74 82 75 [HistoryLists\hlIncludePath] 83 Count=26 84 Item0=rc\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 85 Item1=rc\;C:\Program Files\Borland\CBuilder5\Bin\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 86 Item2=C:\Program Files\Borland\CBuilder5\Bin;rc\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 87 Item3=rc\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 88 Item4=rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 89 Item5=rc\;rc;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include;..\mb_client\lib 90 Item6=rc\;rc;D:\freeamp\freeamp\plm\metadata\id3v2\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 91 Item7=rc\;D:\freeamp\freeamp\plm\metadata\id3v2\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 92 Item8=D:\freeamp\freeamp\plm\metadata\id3v2\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 93 Item9=D:\freeamp\freeamp\plm\metadata\id3v2;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 94 Item10=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 95 Item11=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3 96 Item12=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3\src 97 Item13=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src 98 Item14=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmpg3\src 99 Item15=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xinmpg3\src 100 Item16=rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 101 Item17=rc\;rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 102 Item18=rc\;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 103 Item19=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 104 Item20=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 105 Item21=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 106 Item22=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;D:\bitzi\bitcollider\include 107 Item23=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl 108 Item24=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\include;$(BCB)\include\vcl 109 Item25=$(BCB)\include;$(BCB)\include\vcl 76 Count=29 77 Item0=rc\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\trm;..\id3lib\include;..\mb_client\lib 78 Item1=rc\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\mad\msvc++\libmad;..\id3lib\include;..\mb_client\lib 79 Item2=rc\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\mad\msvc++\madlib;..\id3lib\include;..\mb_client\lib 80 Item3=rc\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 81 Item4=rc\;C:\Program Files\Borland\CBuilder5\Bin\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 82 Item5=C:\Program Files\Borland\CBuilder5\Bin;rc\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 83 Item6=rc\;rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 84 Item7=rc;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src;..\id3lib\include;..\mb_client\lib 85 Item8=rc\;rc;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include;..\mb_client\lib 86 Item9=rc\;rc;D:\freeamp\freeamp\plm\metadata\id3v2\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 87 Item10=rc\;D:\freeamp\freeamp\plm\metadata\id3v2\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 88 Item11=D:\freeamp\freeamp\plm\metadata\id3v2\;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 89 Item12=D:\freeamp\freeamp\plm\metadata\id3v2;rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 90 Item13=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3;..\id3lib\include 91 Item14=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3 92 Item15=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;xingmp3\src 93 Item16=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmp3\src 94 Item17=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xingmpg3\src 95 Item18=rc;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\xinmpg3\src 96 Item19=rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 97 Item20=rc\;rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 98 Item21=rc\;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 99 Item22=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 100 Item23=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 101 Item24=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include 102 Item25=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;D:\bitzi\bitcollider\include 103 Item26=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl 104 Item27=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\include;$(BCB)\include\vcl 105 Item28=$(BCB)\include;$(BCB)\include\vcl 110 106 111 107 [HistoryLists\hlLibraryPath] … … 138 134 139 135 [HistoryLists\hlConditionals] 140 Count=8 141 Item0=NO_WIN32_LEAN_AND_MEAN;WIN32;_DEBUG 142 Item1=NO_WIN32_LEAN_AND_MEAN;WIN32 143 Item2=NO_WIN32_LEAN_AND_MEAN;_DEBUG;WIN32 144 Item3=NO_WIN32_LEAN_AND_MEAN;_DEBUG,WIN32 145 Item4=NO_WIN32_LEAN_AND_MEAN;_DEBUG 146 Item5=NO_WIN32_LEAN_AND_MEAN 147 Item6=_DEBUG;NO_WIN32_LEAN_AND_MEAN 148 Item7=_DEBUG 136 Count=11 137 Item0=NO_WIN32_LEAN_AND_MEAN;WIN32;ID3LIB_LINKOPTION=3 138 Item1=NO_WIN32_LEAN_AND_MEAN;WIN32;ID3LIB_LINKOPTION=3;_DEBUG 139 Item2=NO_WIN32_LEAN_AND_MEAN;WIN32;_DEBUG;ID3LIB_LINKOPTION=3 140 Item3=NO_WIN32_LEAN_AND_MEAN;WIN32;_DEBUG 141 Item4=NO_WIN32_LEAN_AND_MEAN;WIN32 142 Item5=NO_WIN32_LEAN_AND_MEAN;_DEBUG;WIN32 143 Item6=NO_WIN32_LEAN_AND_MEAN;_DEBUG,WIN32 144 Item7=NO_WIN32_LEAN_AND_MEAN;_DEBUG 145 Item8=NO_WIN32_LEAN_AND_MEAN 146 Item9=_DEBUG;NO_WIN32_LEAN_AND_MEAN 147 Item10=_DEBUG 148 149 [HistoryLists\hlIntOutputDir] 150 Count=1 151 Item0=obj 149 152 150 153 [Debugging] mb_tagger/trunk/mbtagger.cpp
r799 r800 7 7 USEFORM("optionsdialog.cpp", PreferencesForm); 8 8 USERES("mbtagger.res"); 9 USEUNIT("trmgen.cpp");10 9 USEUNIT("analyzer.cpp"); 11 10 USEUNIT("filecache.cpp"); 12 11 USELIB("musicbrainz.lib"); 13 USELIB("id3lib.lib");14 12 USEUNIT("lookup.cpp"); 15 13 USEUNIT("mbid3.cpp"); 16 14 USEFORM("lookupdialog.cpp", TrackLookupDialog); 17 15 USERC("rc\resources.rc"); 18 USEUNIT("..\xingmp3\src\isbt.c");19 USEUNIT("..\xingmp3\src\csbt.c");20 USEUNIT("..\xingmp3\src\cup.c");21 USEUNIT("..\xingmp3\src\cupl3.c");22 USEUNIT("..\xingmp3\src\cwinm.c");23 USEUNIT("..\xingmp3\src\dec8.c");24 USEUNIT("..\xingmp3\src\hwin.c");25 USEUNIT("..\xingmp3\src\icdct.c");26 USEUNIT("..\xingmp3\src\cdct.c");27 USEUNIT("..\xingmp3\src\iup.c");28 USEUNIT("..\xingmp3\src\iwinm.c");29 USEUNIT("..\xingmp3\src\l3dq.c");30 USEUNIT("..\xingmp3\src\l3init.c");31 USEUNIT("..\xingmp3\src\mdct.c");32 USEUNIT("..\xingmp3\src\mhead.c");33 USEUNIT("..\xingmp3\src\msis.c");34 USEUNIT("..\xingmp3\src\uph.c");35 USEUNIT("..\xingmp3\src\upsf.c");36 USEUNIT("..\xingmp3\src\wcvt.c");37 16 USEUNIT("dirsearch.cpp"); 38 17 USEUNIT("debug.cpp"); 39 18 USEUNIT("tview.cpp"); 40 19 USEUNIT("submit.cpp"); 41 USEUNIT("trmwav.cpp"); 20 USELIB("trm.lib"); 21 USELIB("id3lib.lib"); 42 22 //--------------------------------------------------------------------------- 43 23 WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) mb_tagger/trunk/optionsdialog.cpp
r787 r800 5 5 #pragma hdrstop 6 6 7 #include "defs.h" 7 8 #include "optionsdialog.h" 8 9 … … 77 78 renameCheck->State = newValues.renameFiles ? cbChecked : cbUnchecked; 78 79 fileSaveSpecEdit->Enabled = newValues.renameFiles; 80 81 versionLabel->Caption = AnsiString(MB_TAGGER_NAME) + " / " + 82 AnsiString(MB_TAGGER_VERSION); 79 83 } 80 84 mb_tagger/trunk/optionsdialog.dfm
r799 r800 14 14 Font.Style = [] 15 15 OldCreateOrder = False 16 Position = po DesktopCenter16 Position = poMainFormCenter 17 17 OnCreate = FormCreate 18 18 PixelsPerInch = 96 … … 336 336 Caption = 'About' 337 337 ImageIndex = 2 338 object Label2: TLabel338 object versionLabel: TLabel 339 339 Left = 8 340 340 Top = 9 … … 343 343 Alignment = taCenter 344 344 AutoSize = False 345 Caption = ' MusicBrainz Tagger / 0.2.1'345 Caption = '(app name) / (version)' 346 346 Font.Charset = DEFAULT_CHARSET 347 347 Font.Color = clWindowText mb_tagger/trunk/optionsdialog.h
r787 r800 20 20 TPageControl *pageControl; 21 21 TTabSheet *aboutSheet; 22 TLabel * Label2;22 TLabel *versionLabel; 23 23 TLabel *Label3; 24 24 TLabel *infoLabel; mb_tagger/trunk/preferences.cpp
r798 r800 50 50 // prefs.server = "www.musicbrainz.org"; 51 51 // prefs.server = "musicbrainz.eorbit.net"; 52 prefs.server = " www.musicbrainz.org";52 prefs.server = "10.1.1.4"; 53 53 54 54 try mb_tagger/trunk/tview.cpp
r799 r800 344 344 return eSaved; 345 345 } 346 if ( node == pendingNode || node->HasAsParent(pendingNode))346 if (pendingNode && (node == pendingNode || node->HasAsParent(pendingNode))) 347 347 { 348 348 mutex->Release(); 349 349 return ePending; 350 350 } 351 if ( node == errorNode || node->HasAsParent(errorNode))351 if (errorNode && (node == errorNode || node->HasAsParent(errorNode))) 352 352 { 353 353 mutex->Release(); … … 424 424 425 425 if (recognizedNode == NULL) 426 count = 0;426 count = 0; 427 427 else 428 428 {
