wxString::c_str() for varargs AGAIN

Originally committed to SVN as r177.

core/ass_export_filter.cpp

@@ -67,7 +67,7 @@ AssExportFilter::~AssExportFilter() {
 void AssExportFilter::Register (wxString name,int priority) {
 	// Check if it's registered
 	if (RegisterName != _T("")) {
-		throw wxString::Format(_T("Register export filter: filter with name \"%s\" is already registered."), name);
+		throw wxString::Format(_T("Register export filter: filter with name \"%s\" is already registered."), name.c_str());
 	}
 
 	// Remove pipes from name
@@ -78,7 +78,7 @@ void AssExportFilter::Register (wxString name,int priority) {
 	FilterList::iterator end = AssExportFilterChain::GetFilterList()->end();
 	for (FilterList::iterator cur=begin;cur!=end;cur++) {
 		if ((*cur)->RegisterName == name) {
-			throw wxString::Format(_T("Register export filter: name \"%s\" already exists."), name);
+			throw wxString::Format(_T("Register export filter: name \"%s\" already exists."), name.c_str());
 		}
 	}
 
@@ -103,7 +103,7 @@ void AssExportFilter::Register (wxString name,int priority) {
 // Unregister
 void AssExportFilter::Unregister () {
 	// Check if it's registered
-	if (!IsRegistered()) throw wxString::Format(_T("Unregister export filter: name \"%s\" is not registered."), RegisterName);
+	if (!IsRegistered()) throw wxString::Format(_T("Unregister export filter: name \"%s\" is not registered."), RegisterName.c_str());
 
 	// Unregister
 	RegisterName = _T("");

core/ass_exporter.cpp

@@ -91,7 +91,7 @@ void AssExporter::AddFilter(wxString name) {
 	}
 	
 	// Check
-	if (!filter) throw wxString::Format(_T("Filter not found: %s"), name);
+	if (!filter) throw wxString::Format(_T("Filter not found: %s"), name.c_str());
 
 	// Add to list
 	Filters.push_back(filter);
@@ -176,5 +176,5 @@ wxString AssExporter::GetDescription(wxString name) {
 			return (*cur)->Description;
 		}
 	}
-	throw wxString::Format(_T("Filter not found: %s"), name);
+	throw wxString::Format(_T("Filter not found: %s"), name.c_str());
 }

core/ass_override.cpp

@@ -501,7 +501,7 @@ void AssOverrideTag::SetText (wxString text) {
 
 	// Set tag name
 	if (!Name.empty()) {
-		wxLogDebug(_T("Parsing tag: %s"), Name);
+		wxLogDebug(_T("Parsing tag: %s"), Name.c_str());
 		ParseParameters(text.Mid(Name.length()));
 		valid = true;
 	}
@@ -554,7 +554,7 @@ void AssOverrideTag::ParseParameters(wxString text) {
 				// parDepth 1 is where we start, and the tag-level we're interested in parsing on
 				if (text[i] == _T(',') && parDepth == 1) break;
 				if (parDepth < 0) {
-					wxLogWarning(_T("Unmatched parenthesis near '%s'!\nTag-parsing incomplete."), text.SubString(i, 10));
+					wxLogWarning(_T("Unmatched parenthesis near '%s'!\nTag-parsing incomplete."), text.SubString(i, 10).c_str());
 					goto end_tokenizing;
 				}
 				if (parDepth == 0) {
@@ -568,7 +568,7 @@ void AssOverrideTag::ParseParameters(wxString text) {
 			work = text.SubString(start, i-1);
 			work.Trim(true).Trim(false);
 			paramList.Add(work);
-			wxLogDebug(_T("Got parameter: %s"), work);
+			wxLogDebug(_T("Got parameter: %s"), work.c_str());
 		}
 
 		if (i+1 < textlen) {

core/audio_karaoke.cpp

@@ -151,7 +151,7 @@ void AudioKaraoke::Commit() {
 		workDiag->ClearBlocks();
 		for (size_t i=0;i<n;i++) {
 			syl = &syllables.at(i);
-			finalText += wxString::Format(_T("{%s%i}"), syl->tag, syl->length) + syl->contents;
+			finalText += wxString::Format(_T("{%s%i}"), syl->tag.c_str(), syl->length) + syl->contents;
 		}
 		workDiag->Text = finalText;
 		workDiag->ParseASSTags();

core/audio_player_portaudio.cpp

@@ -53,7 +53,7 @@ PortAudioPlayer::PortAudioPlayer() {
 	if (!pa_refcount) {
 		PaError err = Pa_Initialize();
 		if (err != paNoError)
-			throw wxString::Format(_T("Failed opening PortAudio with error: %s"), wxString(Pa_GetErrorText(err),wxConvLocal));
+			throw wxString::Format(_T("Failed opening PortAudio with error: %s"), Pa_GetErrorText(err));
 		pa_refcount++;
 	}
 

core/automation.cpp

@@ -295,7 +295,7 @@ namespace AutomationHelper {
 		int spacing = (int)L_gettableN(L, "spacing");
 		int charset = (int)L_gettableN(L, "encoding");
 
-		wxLogDebug(_T("text_extents for: %s:%f:%d%d%d%d:%f:%f:%d:%d"), fontname, fontsize, bold, italic, underline, strikeout, scale_x, scale_y, spacing, charset);
+		wxLogDebug(_T("text_extents for: %s:%f:%d%d%d%d:%f:%f:%d:%d"), fontname.c_str(), fontsize, bold, italic, underline, strikeout, scale_x, scale_y, spacing, charset);
 
 #ifdef WIN32
 		HDC thedc = CreateCompatibleDC(0);

core/export_framerate.cpp

@@ -201,7 +201,7 @@ void AssTransformFramerateFilter::TransformTimeTags (wxString name,int n,AssOver
 			curKarPos = lineData->ko;
 			lineData->ko += parVal/10;
 		}
-		else throw wxString::Format(_T("Unknown karaoke tag! '%s'"), name);
+		else throw wxString::Format(_T("Unknown karaoke tag! '%s'"), name.c_str());
 		curKarPos *= 10;
 		parVal += curKarPos;
 	}