projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Large image-loading speedup and small attribute-loading speedup
[wxWidgets.git]
/
src
/
unix
/
sound_sdl.cpp
diff --git
a/src/unix/sound_sdl.cpp
b/src/unix/sound_sdl.cpp
index dff43eeaee8cbb5a1ef75be5ca400b33460768d1..3962e6dc722038401cca5b8ff09c1381b3673a3c 100644
(file)
--- a/
src/unix/sound_sdl.cpp
+++ b/
src/unix/sound_sdl.cpp
@@
-46,7
+46,7
@@
public:
typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction)
(wxSoundBackendSDLNotification&);
typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction)
(wxSoundBackendSDLNotification&);
-wxDECLARE_EVENT(
wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification )
+wxDECLARE_EVENT(
wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification);
#define EVT_SOUND_BACKEND_SDL_NOTIFICATON(func) \
DECLARE_EVENT_TABLE_ENTRY(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, \
#define EVT_SOUND_BACKEND_SDL_NOTIFICATON(func) \
DECLARE_EVENT_TABLE_ENTRY(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, \
@@
-56,7
+56,7
@@
wxDECLARE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotifica
NULL ),
IMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler)
NULL ),
IMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler)
-wxDEFINE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification )
+wxDEFINE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification )
;
wxSoundBackendSDLNotification::wxSoundBackendSDLNotification()
{
wxSoundBackendSDLNotification::wxSoundBackendSDLNotification()
{
@@
-73,7
+73,7
@@
public:
m_data(NULL), m_evtHandler(NULL) {}
virtual ~wxSoundBackendSDL();
m_data(NULL), m_evtHandler(NULL) {}
virtual ~wxSoundBackendSDL();
- wxString GetName() const { return
_
T("Simple DirectMedia Layer"); }
+ wxString GetName() const { return
wx
T("Simple DirectMedia Layer"); }
int GetPriority() const { return 9; }
bool IsAvailable() const;
bool HasNativeAsyncPlayback() const { return true; }
int GetPriority() const { return 9; }
bool IsAvailable() const;
bool HasNativeAsyncPlayback() const { return true; }
@@
-109,8
+109,8
@@
public:
private:
void OnNotify(wxSoundBackendSDLNotification& WXUNUSED(event))
{
private:
void OnNotify(wxSoundBackendSDLNotification& WXUNUSED(event))
{
- wxLogTrace(
_
T("sound"),
-
_
T("received playback status change notification"));
+ wxLogTrace(
wx
T("sound"),
+
wx
T("received playback status change notification"));
m_backend->FinishedPlayback();
}
wxSoundBackendSDL *m_backend;
m_backend->FinishedPlayback();
}
wxSoundBackendSDL *m_backend;
@@
-139,7
+139,7
@@
bool wxSoundBackendSDL::IsAvailable() const
return false;
}
wxConstCast(this, wxSoundBackendSDL)->m_initialized = true;
return false;
}
wxConstCast(this, wxSoundBackendSDL)->m_initialized = true;
- wxLogTrace(
_T("sound"), _
T("initialized SDL audio subsystem"));
+ wxLogTrace(
wxT("sound"), wx
T("initialized SDL audio subsystem"));
return true;
}
return true;
}
@@
-208,13
+208,13
@@
bool wxSoundBackendSDL::OpenAudio()
m_spec.callback = wx_sdl_audio_callback;
m_spec.userdata = (void*)this;
m_spec.callback = wx_sdl_audio_callback;
m_spec.userdata = (void*)this;
- wxLogTrace(
_T("sound"), _
T("opening SDL audio..."));
+ wxLogTrace(
wxT("sound"), wx
T("opening SDL audio..."));
if (SDL_OpenAudio(&m_spec, NULL) >= 0)
{
#if wxUSE_LOG_DEBUG
char driver[256];
SDL_AudioDriverName(driver, 256);
if (SDL_OpenAudio(&m_spec, NULL) >= 0)
{
#if wxUSE_LOG_DEBUG
char driver[256];
SDL_AudioDriverName(driver, 256);
- wxLogTrace(
_T("sound"), _
T("opened audio, driver '%s'"),
+ wxLogTrace(
wxT("sound"), wx
T("opened audio, driver '%s'"),
wxString(driver, wxConvLocal).c_str());
#endif
m_audioOpen = true;
wxString(driver, wxConvLocal).c_str());
#endif
m_audioOpen = true;
@@
-235,7
+235,7
@@
void wxSoundBackendSDL::CloseAudio()
if (m_audioOpen)
{
SDL_CloseAudio();
if (m_audioOpen)
{
SDL_CloseAudio();
- wxLogTrace(
_T("sound"), _
T("closed audio"));
+ wxLogTrace(
wxT("sound"), wx
T("closed audio"));
m_audioOpen = false;
}
}
m_audioOpen = false;
}
}
@@
-278,7
+278,7
@@
bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags,
}
SDL_LockAudio();
}
SDL_LockAudio();
- wxLogTrace(
_T("sound"), _
T("playing new sound"));
+ wxLogTrace(
wxT("sound"), wx
T("playing new sound"));
m_playing = true;
m_pos = 0;
m_loop = (flags & wxSOUND_LOOP);
m_playing = true;
m_pos = 0;
m_loop = (flags & wxSOUND_LOOP);
@@
-291,7
+291,7
@@
bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags,
// wait until playback finishes if called in sync mode:
if (!(flags & wxSOUND_ASYNC))
{
// wait until playback finishes if called in sync mode:
if (!(flags & wxSOUND_ASYNC))
{
- wxLogTrace(
_T("sound"), _
T("waiting for sample to finish"));
+ wxLogTrace(
wxT("sound"), wx
T("waiting for sample to finish"));
while (m_playing && m_data == data)
{
#if wxUSE_THREADS
while (m_playing && m_data == data)
{
#if wxUSE_THREADS
@@
-306,7
+306,7
@@
bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags,
wxMutexGuiEnter();
#endif
}
wxMutexGuiEnter();
#endif
}
- wxLogTrace(
_T("sound"), _
T("sample finished"));
+ wxLogTrace(
wxT("sound"), wx
T("sample finished"));
}
return true;
}
return true;