Merge lp:~ricmm/qtubuntu/media-keys into lp:qtubuntu

[Ricardo Mendoza]

Extra keys

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/170/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/170/rebuild

review: Approve (continuous-integration)

[lp:~ricmm/qtubuntu/media-keys]

246. By Ricardo Mendoza on 2014-09-30

Build debug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/37/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/171/rebuild

review: Approve (continuous-integration)

[lp:~ricmm/qtubuntu/media-keys]

247. By Ricardo Mendoza on 2014-10-01

Print

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:247
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/39/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/173/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

This been sitting here a while. Am happy to approve the added keys, but you've other debug lines changed

review: Needs Fixing

Unmerged revisions

247. By Ricardo Mendoza on 2014-10-01

Print

246. By Ricardo Mendoza on 2014-09-30

Build debug

245. By Ricardo Mendoza on 2014-09-30

Extra mappings for media controls

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2014-09-02 10:34:47 +0000
+++ src/ubuntumirclient/input.cpp	2014-10-01 13:44:58 +0000
@@ -119,6 +119,13 @@
     XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
     XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
 
+    XKB_KEY_XF86AudioMute,           Qt::Key_VolumeMute,
+    XKB_KEY_XF86AudioPrev,           Qt::Key_MediaPrevious,
+    XKB_KEY_XF86AudioNext,           Qt::Key_MediaNext,
+    XKB_KEY_XF86AudioPlay,           Qt::Key_MediaPlay,
+    XKB_KEY_XF86AudioStop,           Qt::Key_MediaStop,
+    XKB_KEY_XF86AudioPause,          Qt::Key_MediaPause,
+
     0,                          0
 };
 
@@ -370,16 +377,16 @@
 {
     const WindowEvent* event = reinterpret_cast<const WindowEvent*>(ev);
 
-    #if (LOG_EVENTS != 0)
+//    #if (LOG_EVENTS != 0)
     // Key event logging.
-    LOG("KEY device_id:%d source_id:%d action:%d flags:%d meta_state:%d key_code:%d "
+    fprintf(stderr, "KEY device_id:%d source_id:%d action:%d flags:%d meta_state:%d key_code:%d "
             "scan_code:%d repeat_count:%d down_time:%lld event_time:%lld is_system_key:%d",
             event->key.device_id, event->key.source_id,
             event->key.action, event->key.flags, event->key.meta_state,
             event->key.key_code, event->key.scan_code,
             event->key.repeat_count, event->key.down_time,
             event->key.event_time, event->key.is_system_key);
-    #endif
+//    #endif
 
     ulong timestamp = event->key.event_time / 1000000;
     xkb_keysym_t xk_sym = (xkb_keysym_t)event->key.key_code;