less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 19 insertions, 19 deletions

diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp
index 551d0d2a5e..e6a7a77c7b 100644
--- a/plugins/ListeningTo/src/players/generic.cpp
+++ b/plugins/ListeningTo/src/players/generic.cpp
@@ -32,11 +32,11 @@ void m_log(const wchar_t *function, const wchar_t *fmt, ...)
 			return;

 	}

 

-	mir_writeLogT(hLog, L"%s: ", function);

+	mir_writeLogW(hLog, L"%s: ", function);

 

 	va_list args;

 	va_start(args, fmt);

-	mir_writeLogVT(hLog, fmt, args);

+	mir_writeLogVW(hLog, fmt, args);

 }

 

 static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

@@ -163,9 +163,9 @@ void GenericPlayer::ProcessReceived()
 		li->ptszGenre = U2T(parts[8]);

 

 		if (player == this)

-			li->ptszPlayer = mir_u2t(parts[1]);

+			li->ptszPlayer = mir_wstrdup(parts[1]);

 		else

-			li->ptszPlayer = mir_tstrdup(player->name);

+			li->ptszPlayer = mir_wstrdup(player->name);

 

 		if (parts[9] != NULL) {

 			long length = _wtoi(parts[9]);

@@ -177,9 +177,9 @@ void GenericPlayer::ProcessReceived()
 				int h = (length / 60) / 60;

 

 				if (h > 0)

-					mir_sntprintf(li->ptszLength, 9, L"%d:%02d:%02d", h, m, s);

+					mir_snwprintf(li->ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 				else

-					mir_sntprintf(li->ptszLength, 9, L"%d:%02d", m, s);

+					mir_snwprintf(li->ptszLength, 9, L"%d:%02d", m, s);

 			}

 		}

 	}

diff --git a/plugins/ListeningTo/src/players/itunes.cpp b/plugins/ListeningTo/src/players/itunes.cpp
index fa6f2478e6..167779db76 100644
--- a/plugins/ListeningTo/src/players/itunes.cpp
+++ b/plugins/ListeningTo/src/players/itunes.cpp
@@ -125,12 +125,12 @@ BOOL ITunes::FillCache()
 		int h = (lret / 60) / 60;

 

 		if (h > 0)

-			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

+			mir_snwprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 		else

-			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

+			mir_snwprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

 	}

 

-	listening_info.ptszType = mir_tstrdup(L"Music");

+	listening_info.ptszType = mir_wstrdup(L"Music");

 

 	if (listening_info.ptszTitle == NULL) {

 		// Get from filename

@@ -140,14 +140,14 @@ BOOL ITunes::FillCache()
 		else

 			p = filename;

 

-		listening_info.ptszTitle = mir_u2t(p);

+		listening_info.ptszTitle = mir_wstrdup(p);

 

 		wchar_t *pt = wcsrchr(listening_info.ptszTitle, '.');

 		if (pt != NULL)

 			*p = '\0';

 	}

 

-	listening_info.ptszPlayer = mir_tstrdup(name);

+	listening_info.ptszPlayer = mir_wstrdup(name);

 

 	listening_info.cbSize = sizeof(listening_info);

 	listening_info.dwFlags = LTI_TCHAR;

diff --git a/plugins/ListeningTo/src/players/mradio.cpp b/plugins/ListeningTo/src/players/mradio.cpp
index 5654325be2..60a88ec252 100644
--- a/plugins/ListeningTo/src/players/mradio.cpp
+++ b/plugins/ListeningTo/src/players/mradio.cpp
@@ -43,9 +43,9 @@ int MRadio::GetData()
 		if (!db_get_s(hContact, "mRadio", "Nick", &dbv)) {

 			listening_info.cbSize = sizeof(listening_info);

 			listening_info.dwFlags = LTI_TCHAR;

-			listening_info.ptszArtist = mir_tstrdup(L"Radio");

-			listening_info.ptszType = mir_tstrdup(L"Radio");

-			listening_info.ptszTitle = mir_a2t(dbv.pszVal);

+			listening_info.ptszArtist = mir_wstrdup(L"Radio");

+			listening_info.ptszType = mir_wstrdup(L"Radio");

+			listening_info.ptszTitle = mir_a2u(dbv.pszVal);

 

 			db_free(&dbv);

 			return 1;

diff --git a/plugins/ListeningTo/src/players/watrack.cpp b/plugins/ListeningTo/src/players/watrack.cpp
index d76b79571b..895c555b91 100644
--- a/plugins/ListeningTo/src/players/watrack.cpp
+++ b/plugins/ListeningTo/src/players/watrack.cpp
@@ -102,15 +102,15 @@ void WATrack::GetData()
 		int h = (si->total / 60) / 60;

 

 		if (h > 0)

-			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

+			mir_snwprintf(listening_info.ptszLength, 9, L"%d:%02d:%02d", h, m, s);

 		else

-			mir_sntprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

+			mir_snwprintf(listening_info.ptszLength, 9, L"%d:%02d", m, s);

 	}

 

 	if (si->width > 0)

-		listening_info.ptszType = mir_tstrdup(L"Video");

+		listening_info.ptszType = mir_wstrdup(L"Video");

 	else

-		listening_info.ptszType = mir_tstrdup(L"Music");

+		listening_info.ptszType = mir_wstrdup(L"Music");

 

 	listening_info.ptszPlayer = DUPD(si->player, name);

 

diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp
index c3131e8718..f7d2ab6df2 100644
--- a/plugins/ListeningTo/src/players/wmp.cpp
+++ b/plugins/ListeningTo/src/players/wmp.cpp
@@ -100,7 +100,7 @@ void WindowsMediaPlayer::ProcessReceived()
 			listening_info.ptszArtist = U2T(parts[5]);

 			listening_info.ptszAlbum = U2T(parts[6]);

 

-			listening_info.ptszPlayer = mir_tstrdup(name);

+			listening_info.ptszPlayer = mir_wstrdup(name);

 		}

 

 		// Put back the '\\'s