Update curl and minor bug fixes

This commit reflects the changes made as of version 2.2.5, which was
released on August 11th, 2017.  As such, curl is updated to the most
recent version at that time (7.54.0) and the resulting build should be
equivalent to the build that has been distributed.

Changelog.txt

@@ -7,6 +7,20 @@ Changelog
 NOTE: This file only lists changes to the user interface program.
       Refer to the bgmlib changelog for changes to supported games and the back-end engine.
 
+- 2017/06/04 (Version 2.2.4)
+* Fix bug with Tasofro extraction not ignoring the Remove Opening Silence option.
+
+----
+
+- 2017/06/03 (Version 2.2.3)
+* Fix parsing of references, now removing them as intended.
+
+----
+
+- 2017/05/29 (Version 2.2.2)
+* Updated curl to fix automatic track name and comment translation downloading from Touhou Wiki
+
+----
 
 - 2011/05/14 (Version 2.2)
 * Added an appropriate warning for custom encoders when dealing with lossy music

src/enc_vorbis.cpp

@@ -211,14 +211,14 @@ bool Encoder_Vorbis::Extract(TrackInfo* TI, FXString& EncFN, GameInfo* GI, Extra
 				if(VF.links == 1)	CSA = false;
 
 				// This is necessary because seeking to 0 apparently breaks the codebooks
-				Start = TI->GetStart(FMT_SAMPLE, CSA ? 0 : SilRem);
+				Start = TI->GetStart(FMT_SAMPLE, CSA ? 0 : SilResolve());
 				if(!(CSA && !Start) )	ov_pcm_seek(&VF, Start);
 			}
 			else	CSA = false;
 		}
 		else
 		{
-			V.In.position(TI->GetStart(FMT_BYTE, SilRem));
+			V.In.position(TI->GetStart(FMT_BYTE, SilResolve()));
 		}
 	}
 
@@ -285,14 +285,14 @@ bool Encoder_Vorbis::Extract(TrackInfo* TI, FXString& EncFN, GameInfo* GI, Extra
 
 		StreamLen = ov_pcm_total(&VF, Link);
 
-		EncLen = TI->GetByteLength(SilRem, LoopCnt, FadeDur);
+		EncLen = TI->GetByteLength(SilResolve(), LoopCnt, FadeDur);
 	}
 	else
 	{
 		BGMLib::UI_Stat_Safe("intro...");
 		vorbis_write_headers(V.Out, &ES.stream_out, &ES.vi, &TF->vc);
 
-		EncLen = TI->GetByteLength(SilRem, 1, fabs(FadeDur));
+		EncLen = TI->GetByteLength(SilResolve(), 1, fabs(FadeDur));
 		if(V.FadeStart < EncLen)	EncLen = V.FadeStart + V.FadeBytes;
 
 		StreamLen = V.tl - ( (TI->FS != 0) ? 0 : V.ts_data);

src/extract.cpp

@@ -33,7 +33,7 @@ bool OpenVorbisBGM(FXFile& File, OggVorbis_File& VF, GameInfo* GI, TrackInfo* TI
 	if(!GI->OpenBGMFile(File, TI))	return false;
 
 	if(ov_open_callbacks(&File, &VF, NULL, 0, OV_CALLBACKS_FXFILE))	return false;
-	ov_pcm_seek(&VF, TI->GetStart(FMT_SAMPLE, SilRem));
+	ov_pcm_seek(&VF, TI->GetStart(FMT_SAMPLE, SilResolve()));
 	return true;
 }
 
@@ -156,10 +156,10 @@ Extract_Vals::Extract_Vals(TrackInfo* TI, const bool& Fmt)
 
 void Extract_Vals::Init(TrackInfo* TI, const bool& Fmt)
 {
-	TI->GetPos(Fmt, SilRem, &ts_ext, &tl, &te);
+	TI->GetPos(Fmt, SilResolve(), &ts_ext, &tl, &te);
 	TI->GetPos(Fmt, false, &ts_data);
 
-	Len = TI->GetByteLength(SilRem, LoopCnt, FadeDur);
+	Len = TI->GetByteLength(SilResolve(), LoopCnt, FadeDur);
 
 	FadeBytes = (ulong)(fabs(FadeDur) * TI->Freq * 4.0f);
 
@@ -248,7 +248,7 @@ bool Extractor::PrepareInput(TrackInfo* TI, GameInfo* GI, Extract_Vals& V)
 		{
 			if(!OpenVorbisBGM(V.In, VF, GI, TI))	return false;
 		}
-		Size = TI->GetByteLength(SilRem, 1, 0);
+		Size = TI->GetByteLength(SilResolve(), 1, 0);
 		V.d = 0;
 
 		V.Out.open(DecodeFile, FXIO::Writing);

src/mainwnd.cpp

@@ -243,6 +243,7 @@ MainWnd::MainWnd(FXApp* App, FXIcon* Ico)
 		AlgBox->setNumVisible(Ext.FAs.Size());
 
 		RemoveSilence = new FXCheckButton(ParamBox, "Remove opening silence", this, MW_UPDATE_LENGTHS, CHECKBUTTON_NORMAL);
+		RemEnabled = RemoveSilence->isEnabled();
 
 	StartFrame = new FXVerticalFrame(OutRightFrame, LAYOUT_FILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 		StartAll = new FXButton(StartFrame, "Extract all", NULL, this, MW_EXTRACT_ALL, BUTTON_NORMAL | LAYOUT_FILL);
@@ -279,7 +280,7 @@ void MainWnd::create()
 
 	StreamerFront::Inst().Init(id());
 
-	RemoveSilence->handle(this, FXSEL(SEL_COMMAND, SilRem ? ID_CHECK : ID_UNCHECK), (void*)SilRem);
+	RemoveSilence->handle(this, FXSEL(SEL_COMMAND, SilResolve() ? ID_CHECK : ID_UNCHECK), (void*)SilResolve());
 	TrackPlay->handle(this, FXSEL(SEL_COMMAND, Play ? ID_CHECK : ID_UNCHECK), (void*)Play);
 	handle(this, FXSEL(SEL_COMMAND, MW_TOGGLE_PLAY), (void*)Play);
 
@@ -416,6 +417,7 @@ void MainWnd::LoadGame(GameInfo* GI)
 		Comment->setText("");
 		GameDir->Field->setText("");
 		RemoveSilence->enable();
+		RemEnabled = RemoveSilence->isEnabled();
 		handle(this, FXSEL(SEL_COMMAND, MW_CHANGE_ACTION_STATE), false);
 		TrackView->fitColumnsToContents(0, TrackView->getNumColumns());
 	}
@@ -454,6 +456,7 @@ void MainWnd::LoadGame(GameInfo* GI)
 
 		if((GI->CryptKind && GI->Vorbis) || !GI->SilenceScan)	RemoveSilence->disable();
 		else	RemoveSilence->enable();
+		RemEnabled = RemoveSilence->isEnabled();
 
 		Str.RequestTrackSwitch(CurTrack);
 		if(Play)	Str.Play();
@@ -663,7 +666,7 @@ long MainWnd::onCmdLengths(FXObject* Sender, FXSelector Message, void* ptr)
 			continue;
 		}
 
-		Len = TI->GetByteLength(SilRem, LoopCnt, FadeDur);
+		Len = TI->GetByteLength(SilResolve(), LoopCnt, FadeDur);
 
 		TrackView->setItemText(Row, 2, TI->LengthString(Len));
 
@@ -733,7 +736,7 @@ long MainWnd::onPlayStat(FXObject* Sender, FXSelector Message, void* ptr)
 	TrackInfo* TI = Str.CurTrack();
 	if(Play && ActiveGame && TI)
 	{
-		Len = TI->GetByteLength(SilRem, 1, 0);
+		Len = TI->GetByteLength(SilResolve(), 1, 0);
 		Cur = Str.Pos();
 
 		Stat.format("Playing: %s %s  //  %s, %.0f Hz  //  %s / %s", TI->GetNumber(), TI->Name[Lang], ActiveGame->Vorbis ? "Vorbis" : "PCM", TI->Freq, TI->LengthString(Cur), TI->LengthString(Len));

src/musicroom.cpp

@@ -32,6 +32,8 @@ MainWnd* MWBack;	// Back end GUI class
 bool Play;	// Play selected track?
 ushort FadeAlgID = 0;	// Fade algorithm
 bool SilRem = true;	// Remove opening silence?
+bool RemEnabled = true;
+bool SilResolve() { return SilRem && RemEnabled; }
 int Volume = 100;
 // ---
 
@@ -63,7 +65,7 @@ FXString OutPath;	// Output directory
 // String Constants
       FXString PrgName = "Music Room Interface";
 	  FXString WebPage = "http://bit.ly/musicroom_interface";
-const FXString PrgVer = "v2.2";
+const FXString PrgVer = "v2.2.5";
 const FXString NoGame = "(no game loaded)";
       FXString CfgFile = "musicroom.cfg";
 	  FXString LGDFile = "gamedirs.cfg";

src/musicroom.h

@@ -1,6 +1,6 @@
 // Music Room Interface
 // --------------------
-// "©" Nmlgc, 2010-2011
+// "©" Nmlgc, 2010-2011
 
 #ifndef MUSICROOM_MUSICROOM_H
 #define MUSICROOM_MUSICROOM_H
@@ -85,8 +85,10 @@ extern MainWndFront* MW;
 extern bool Play;	// Play selected track?
 extern ushort FadeAlgID;	// Fade algorithm
 extern bool SilRem;	// Remove opening silence?
+extern bool RemEnabled; // Remove Silience Button enabled?
 extern int Volume;
 extern FXFont*	Monospace;
+extern bool SilResolve();
 // ---
 
 // Game

src/stream.cpp

@@ -148,7 +148,7 @@ bool Streamer::SwitchTrack_WAV(TrackInfo* NewTrack, FXString& NewFN)
 
 		if(!ActiveGame->OpenBGMFile(CurFile, NewTrack))	return false;
 	}
-	Pos = NewTrack->GetStart(FMT_BYTE, SilRem);
+	Pos = NewTrack->GetStart(FMT_BYTE, SilResolve());
 	CurFile.position(Pos);
 
 	SB->SetFrequency(NewTrack->Freq);
@@ -171,7 +171,7 @@ bool Streamer::SwitchTrack_OGG(TrackInfo* NewTrack, FXString& NewFN)
 	}
 	else if(Track && CurFNHash == NewFNHash)
 	{
-		ov_pcm_seek(&SF, NewTrack->GetStart(FMT_SAMPLE, SilRem));
+		ov_pcm_seek(&SF, NewTrack->GetStart(FMT_SAMPLE, SilResolve()));
 	}
 	else
 	{
@@ -327,7 +327,7 @@ ulong StreamerFront::Pos()
 
 	ulong Ret = Str.Pos;
 	if(ActiveGame->Vorbis)	Ret <<= 2;
-	if(Str.Track->FS == 0)	Ret -= Str.Track->GetStart(FMT_BYTE, SilRem);
+	if(Str.Track->FS == 0)	Ret -= Str.Track->GetStart(FMT_BYTE, SilResolve());
 	return Ret;
 }
 // ---------

src/wikiupdate.cpp

@@ -2,7 +2,7 @@
 // --------------------
 // wikiupdate.cpp - Touhou Wiki Track Info Updating
 // --------------------
-// "©" Nmlgc, 2010-2011
+// "©" Nmlgc, 2010-2011
 
 #include <bgmlib/platform.h>
 
@@ -160,13 +160,11 @@ FXuint AskForUpdate(TrackInfo* TI, const FXString& Type, FXString* Old, FXString
 {
 	if(New->empty() || *Ret == UPDATE_NOALL) return *Ret;
 
-	// Remove line breaks for comparison
+	// Normalize new-lines.
 	FXString o = *Old, n = *New;
-	o.simplify();
-	n.simplify();
-	removeSub(o, ' ');
-	removeSub(n, ' ');
-	if(o == n)	return *Ret;
+	o.substitute("\r\n", "\n");
+	n.substitute("\r\n", "\n");
+	if(o == n) return *Ret;
 
 	FXString Msg;
 	if(*Ret != UPDATE_YESALL && !Old->empty())
@@ -225,6 +223,12 @@ static TrackInfo* Eval_MusicRoom(GameInfo* GI, FXString& WD, FXuint* MsgRet)
 		SrcVal.format("%s%d", Wiki_Comment[LANG_JP], s);	
 		SrcVal = TemplateElm_Comment(WD, SrcVal);
 
+		// Because some comments skip the first number.
+		if(SrcVal.empty() && s == 1)
+		{
+			s++;
+			continue;
+		}
 		if(SrcVal.empty())	break;
 		NC = &Afterword.Add()->Data;
 
@@ -451,7 +455,21 @@ bool Update(GameInfo* GI, FXString& WikiURL)
 	Page.substitute("&gt;", ">");
 	Page.substitute("&lt;", "<");
 
+	// Remove other references
+	{
+		FXRex regexp_ref;
+		if(!regexp_ref.parse("<ref>.*?</ref>", regexp_mode))
+		{
+			while (regexp_ref.match(Page, &s, &t, FXRex::Forward, 1, s))
+			{
+				Page.erase(s, t-s);
+			}
+		}
+	}
+
 	// Too less time for a proper fix right now
+	// TODO: Investigate linebreak behavior in Touhou Wiki
+	Page.substitute("<br />\n", "\n"); // Hopefully this renders stuff correctly.
 	Page.substitute("<br />", "\n");
 
 	// Magical Astronomy...