From d7e53c4d5a748d5ef8c934e90dc59ff23c667420 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 15:13:30 +0300 Subject: WCHAR -> wchar_t --- plugins/ListeningTo/src/listeningto.cpp | 2 +- plugins/ListeningTo/src/players/generic.cpp | 12 ++++++------ plugins/ListeningTo/src/players/generic.h | 6 +++--- plugins/ListeningTo/src/players/itunes.cpp | 2 +- plugins/ListeningTo/src/players/itunes.h | 2 +- plugins/ListeningTo/src/players/wmp.cpp | 10 +++++----- plugins/ListeningTo/src/players/wmp.h | 4 ++-- plugins/ListeningTo/src/stdafx.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 2cd1c94653..73e52445e6 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -828,7 +828,7 @@ INT_PTR SetNewSong(WPARAM wParam, LPARAM lParam) ((GenericPlayer *)players[GENERIC])->NewData(data, mir_wstrlen(data)); } else { - WCHAR *data = (WCHAR *)wParam; + wchar_t *data = (wchar_t *)wParam; ((GenericPlayer *)players[GENERIC])->NewData(data, mir_wstrlen(data)); } diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp index 4e1224cf34..875fe6a916 100644 --- a/plugins/ListeningTo/src/players/generic.cpp +++ b/plugins/ListeningTo/src/players/generic.cpp @@ -49,7 +49,7 @@ static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam, return FALSE; if (singleton != nullptr) - singleton->NewData((WCHAR *)pData->lpData, pData->cbData / 2); + singleton->NewData((wchar_t *)pData->lpData, pData->cbData / 2); return TRUE; } @@ -99,14 +99,14 @@ void GenericPlayer::ProcessReceived() // Do the processing // L"\\0\\0\\0\\0<Artist>\\0<Album>\\0<Track>\\0<Year>\\0<Genre>\\0<Length (secs)>\\0\\0" - WCHAR *p1 = wcsstr(received, L"\\0"); + wchar_t *p1 = wcsstr(received, L"\\0"); if (IsEmpty(received) || p1 == nullptr) return; // Process string - WCHAR *parts[11] = {}; + wchar_t *parts[11] = {}; int pCount = 0; - WCHAR *p = received; + wchar_t *p = received; do { *p1 = '\0'; parts[pCount] = p; @@ -125,7 +125,7 @@ void GenericPlayer::ProcessReceived() Player *player = this; for (int i = FIRST_PLAYER; i < NUM_PLAYERS; i++) { - WCHAR *player_name = players[i]->name; + wchar_t *player_name = players[i]->name; if (_wcsicmp(parts[1], player_name) == 0) { player = players[i]; @@ -200,7 +200,7 @@ static VOID CALLBACK SendTimerProc(HWND, UINT, UINT_PTR, DWORD) } -void GenericPlayer::NewData(const WCHAR *data, size_t len) +void GenericPlayer::NewData(const wchar_t *data, size_t len) { if (data[0] == '\0') return; diff --git a/plugins/ListeningTo/src/players/generic.h b/plugins/ListeningTo/src/players/generic.h index ca5f6d90d7..3a50d84379 100644 --- a/plugins/ListeningTo/src/players/generic.h +++ b/plugins/ListeningTo/src/players/generic.h @@ -29,8 +29,8 @@ public: GenericPlayer(); virtual ~GenericPlayer(); - WCHAR received[1024]; - WCHAR last_received[1024]; + wchar_t received[1024]; + wchar_t last_received[1024]; void ProcessReceived(); - void NewData(const WCHAR *data, size_t len); + void NewData(const wchar_t *data, size_t len); }; diff --git a/plugins/ListeningTo/src/players/itunes.cpp b/plugins/ListeningTo/src/players/itunes.cpp index 49def11904..abcde96c5d 100644 --- a/plugins/ListeningTo/src/players/itunes.cpp +++ b/plugins/ListeningTo/src/players/itunes.cpp @@ -134,7 +134,7 @@ BOOL ITunes::FillCache() if (listening_info.ptszTitle == nullptr) { // Get from filename - WCHAR *p = wcsrchr(filename, '\\'); + wchar_t *p = wcsrchr(filename, '\\'); if (p != nullptr) p++; else diff --git a/plugins/ListeningTo/src/players/itunes.h b/plugins/ListeningTo/src/players/itunes.h index db0a73af5a..f427c2943e 100644 --- a/plugins/ListeningTo/src/players/itunes.h +++ b/plugins/ListeningTo/src/players/itunes.h @@ -28,7 +28,7 @@ extern "C" class ITunes : public Player { protected: - WCHAR filename[1024]; + wchar_t filename[1024]; HWND hwnd; IiTunes *iTunesApp; diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp index 89f0a3bce1..5a4cd7fd95 100644 --- a/plugins/ListeningTo/src/players/wmp.cpp +++ b/plugins/ListeningTo/src/players/wmp.cpp @@ -66,7 +66,7 @@ void WindowsMediaPlayer::ProcessReceived() // MSNMusicString = L"\\0Music\\0%d\\0%s\\0%s\\0%s\\0%s\\0%s\\0\\0" // MSNMusicString, msn->msncommand, strMSNFormat, msn->title, msn->artist, msn->album, msn->wmcontentid); - WCHAR *p1 = wcsstr(received, L"\\0"); + wchar_t *p1 = wcsstr(received, L"\\0"); if (received[0] == L'\0' || p1 == nullptr) { NotifyInfoChanged(); @@ -74,9 +74,9 @@ void WindowsMediaPlayer::ProcessReceived() } // Process string - WCHAR *parts[8] = {}; + wchar_t *parts[8] = {}; int pCount = 0; - WCHAR *p = received; + wchar_t *p = received; do { *p1 = L'\0'; parts[pCount] = p; @@ -123,7 +123,7 @@ static VOID CALLBACK SendTimerProc(HWND, UINT, UINT_PTR, DWORD) singleton->ProcessReceived(); } -void WindowsMediaPlayer::NewData(const WCHAR *data, size_t len) +void WindowsMediaPlayer::NewData(const wchar_t *data, size_t len) { mir_cslock lck(cs); @@ -152,7 +152,7 @@ static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam, return FALSE; if (singleton != nullptr) - singleton->NewData((WCHAR *)pData->lpData, pData->cbData / 2); + singleton->NewData((wchar_t *)pData->lpData, pData->cbData / 2); return TRUE; } diff --git a/plugins/ListeningTo/src/players/wmp.h b/plugins/ListeningTo/src/players/wmp.h index 954104bcca..f7702a9ea0 100644 --- a/plugins/ListeningTo/src/players/wmp.h +++ b/plugins/ListeningTo/src/players/wmp.h @@ -24,12 +24,12 @@ class WindowsMediaPlayer : public Player { protected: HWND hWnd; - WCHAR received[1024]; + wchar_t received[1024]; public: WindowsMediaPlayer(); virtual ~WindowsMediaPlayer(); void ProcessReceived(); - void NewData(const WCHAR *data, size_t len); + void NewData(const wchar_t *data, size_t len); }; diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h index 1f996ec4a1..60dc3294ef 100644 --- a/plugins/ListeningTo/src/stdafx.h +++ b/plugins/ListeningTo/src/stdafx.h @@ -108,7 +108,7 @@ static bool IsEmpty(const char *str) { return str == nullptr || str[0] == 0; } -static bool IsEmpty(const WCHAR *str) +static bool IsEmpty(const wchar_t *str) { return str == nullptr || str[0] == 0; } -- cgit v1.2.3