diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-06 15:42:16 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-08 11:41:53 +0000 |
commit | 32186f005088fbace08b791df5cf5557f6e5fd24 (patch) | |
tree | 2a4493648f40f9abb42e9f15a6798562a0f6dc49 /vcl | |
parent | 303f08fe4292341cda40f70da3d0f82d69f697aa (diff) |
convert MEDIA_COMMAND constants to scoped enum
Change-Id: Id3731144fab89cdab9a6f66d78a1ebe1ebd4f61c
Reviewed-on: https://gerrit.libreoffice.org/15652
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/osx/salinst.cxx | 22 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 36 |
2 files changed, 29 insertions, 29 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 433aa027f451..b33aaf6b858a 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -473,7 +473,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) #if !HAVE_FEATURE_MACOSX_SANDBOX case AppleRemoteControlEvent: // Defined in <apple_remote/RemoteMainController.h> { - sal_Int16 nCommand = 0; + MediaCommand nCommand; SalData* pSalData = GetSalData(); bool bIsFullScreenMode = false; @@ -488,27 +488,27 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) switch ([pEvent data1]) { case kRemoteButtonPlay: - nCommand = bIsFullScreenMode ? MEDIA_COMMAND_PLAY_PAUSE : MEDIA_COMMAND_PLAY; + nCommand = bIsFullScreenMode ? MediaCommand::PlayPause : MediaCommand::Play; break; // kept for experimentation purpose (scheduled for future implementation) - // case kRemoteButtonMenu: nCommand = MEDIA_COMMAND_MENU; break; + // case kRemoteButtonMenu: nCommand = MediaCommand::Menu; break; - case kRemoteButtonPlus: nCommand = MEDIA_COMMAND_VOLUME_UP; break; + case kRemoteButtonPlus: nCommand = MediaCommand::VolumeUp; break; - case kRemoteButtonMinus: nCommand = MEDIA_COMMAND_VOLUME_DOWN; break; + case kRemoteButtonMinus: nCommand = MediaCommand::VolumeDown; break; - case kRemoteButtonRight: nCommand = MEDIA_COMMAND_NEXTTRACK; break; + case kRemoteButtonRight: nCommand = MediaCommand::NextTrack; break; - case kRemoteButtonRight_Hold: nCommand = MEDIA_COMMAND_NEXTTRACK_HOLD; break; + case kRemoteButtonRight_Hold: nCommand = MediaCommand::NextTrackHold; break; - case kRemoteButtonLeft: nCommand = MEDIA_COMMAND_PREVIOUSTRACK; break; + case kRemoteButtonLeft: nCommand = MediaCommand::PreviousTrack; break; - case kRemoteButtonLeft_Hold: nCommand = MEDIA_COMMAND_REWIND; break; + case kRemoteButtonLeft_Hold: nCommand = MediaCommand::Rewind; break; - case kRemoteButtonPlay_Hold: nCommand = MEDIA_COMMAND_PLAY_HOLD; break; + case kRemoteButtonPlay_Hold: nCommand = MediaCommand::PlayHold; break; - case kRemoteButtonMenu_Hold: nCommand = MEDIA_COMMAND_STOP; break; + case kRemoteButtonMenu_Hold: nCommand = MediaCommand::Stop; break; // FIXME : not detected case kRemoteButtonPlus_Hold: diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index f689dcc7bd25..ff598c8cd430 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5188,26 +5188,26 @@ static bool ImplHandleIMEEndComposition( HWND hWnd ) static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam, LRESULT & nRet ) { - sal_Int16 nCommand = 0; + MediaCommand nCommand; switch( GET_APPCOMMAND_LPARAM(lParam) ) { - case APPCOMMAND_MEDIA_CHANNEL_DOWN: nCommand = MEDIA_COMMAND_CHANNEL_DOWN; break; - case APPCOMMAND_MEDIA_CHANNEL_UP: nCommand = MEDIA_COMMAND_CHANNEL_UP; break; - case APPCOMMAND_MEDIA_NEXTTRACK: nCommand = MEDIA_COMMAND_NEXTTRACK; break; - case APPCOMMAND_MEDIA_PAUSE: nCommand = MEDIA_COMMAND_PAUSE; break; - case APPCOMMAND_MEDIA_PLAY: nCommand = MEDIA_COMMAND_PLAY; break; - case APPCOMMAND_MEDIA_PLAY_PAUSE: nCommand = MEDIA_COMMAND_PLAY_PAUSE; break; - case APPCOMMAND_MEDIA_PREVIOUSTRACK: nCommand = MEDIA_COMMAND_PREVIOUSTRACK; break; - case APPCOMMAND_MEDIA_RECORD: nCommand = MEDIA_COMMAND_RECORD; break; - case APPCOMMAND_MEDIA_REWIND: nCommand = MEDIA_COMMAND_REWIND; break; - case APPCOMMAND_MEDIA_STOP: nCommand = MEDIA_COMMAND_STOP; break; - case APPCOMMAND_MIC_ON_OFF_TOGGLE: nCommand = MEDIA_COMMAND_MIC_ON_OFF_TOGGLE; break; - case APPCOMMAND_MICROPHONE_VOLUME_DOWN: nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_DOWN; break; - case APPCOMMAND_MICROPHONE_VOLUME_MUTE: nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_MUTE; break; - case APPCOMMAND_MICROPHONE_VOLUME_UP: nCommand = MEDIA_COMMAND_MICROPHONE_VOLUME_UP; break; - case APPCOMMAND_VOLUME_DOWN: nCommand = MEDIA_COMMAND_VOLUME_DOWN; break; - case APPCOMMAND_VOLUME_MUTE: nCommand = MEDIA_COMMAND_VOLUME_MUTE; break; - case APPCOMMAND_VOLUME_UP: nCommand = MEDIA_COMMAND_VOLUME_UP; break; + case APPCOMMAND_MEDIA_CHANNEL_DOWN: nCommand = MediaCommand::ChannelDown; break; + case APPCOMMAND_MEDIA_CHANNEL_UP: nCommand = MediaCommand::ChannelUp; break; + case APPCOMMAND_MEDIA_NEXTTRACK: nCommand = MediaCommand::NextTrack; break; + case APPCOMMAND_MEDIA_PAUSE: nCommand = MediaCommand::Pause; break; + case APPCOMMAND_MEDIA_PLAY: nCommand = MediaCommand::Play; break; + case APPCOMMAND_MEDIA_PLAY_PAUSE: nCommand = MediaCommand::PlayPause; break; + case APPCOMMAND_MEDIA_PREVIOUSTRACK: nCommand = MediaCommand::PreviousTrack; break; + case APPCOMMAND_MEDIA_RECORD: nCommand = MediaCommand::Record; break; + case APPCOMMAND_MEDIA_REWIND: nCommand = MediaCommand::Rewind; break; + case APPCOMMAND_MEDIA_STOP: nCommand = MediaCommand::Stop; break; + case APPCOMMAND_MIC_ON_OFF_TOGGLE: nCommand = MediaCommand::MicOnOffToggle; break; + case APPCOMMAND_MICROPHONE_VOLUME_DOWN: nCommand = MediaCommand::MicrophoneVolumeDown; break; + case APPCOMMAND_MICROPHONE_VOLUME_MUTE: nCommand = MediaCommand::MicrophoneVolumeMute; break; + case APPCOMMAND_MICROPHONE_VOLUME_UP: nCommand = MediaCommand::MicrophoneVolumeUp; break; + case APPCOMMAND_VOLUME_DOWN: nCommand = MediaCommand::VolumeDown; break; + case APPCOMMAND_VOLUME_MUTE: nCommand = MediaCommand::VolumeMute; break; + case APPCOMMAND_VOLUME_UP: nCommand = MediaCommand::VolumeUp; break; default: return false; } |