Merge lp:~ricmm/media-hub/default-timeout-increase into lp:media-hub

[Ricardo Mendoza]

Increase default timeout for MPRIS handlers. (Author: Alfonso Sanchez-Beato)

[Ricardo Salveti (rsalveti)]

Good, thanks.

review: Approve

[lp:~ricmm/media-hub/default-timeout-increase]

42. By Ricardo Mendoza on 2014-07-10

Adjust AppArmor rules for new SoCs

43. By Ricardo Mendoza on 2014-07-10

Adjust AppArmor rules. Increase timeout for offending method

[Jim Hodapp (jhodapp)]

Looks good, approved from my as well.

review: Approve (code)

=== modified file 'debian/usr.bin.media-hub-server'
--- debian/usr.bin.media-hub-server	2014-07-01 03:17:05 +0000
+++ debian/usr.bin.media-hub-server	2014-07-10 12:20:07 +0000
@@ -25,6 +25,10 @@
 
   # specific to the mediatek soc
   @{PROC}/xlog/setfil r,
+  @{PROC}/M4U_device r,
+  /dev/Vcodec rw,
+  /sys/bus/platform/drivers/** rw,
+  /{,android/}system/etc/mtk_omx_core.cfg r,
 
   /sys/kernel/debug/tracing/trace_marker w,
   /dev/ashmem rw,

=== modified file 'src/core/media/mpris/macros.h'
--- src/core/media/mpris/macros.h	2014-02-12 15:53:57 +0000
+++ src/core/media/mpris/macros.h	2014-07-10 12:20:07 +0000
@@ -26,6 +26,18 @@
 
 #define SECONDS(seconds) std::chrono::seconds{seconds};
 
+#define METHOD_WITH_TIMEOUT_MS(Name, Itf, Timeout) \
+    struct Name \
+    { \
+        typedef Itf Interface; \
+        inline static const std::string& name() \
+        { \
+            static const std::string s{#Name}; \
+            return s; \
+        } \
+        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::milliseconds{Timeout}; } \
+    };\
+
 #define METHOD(Name, Itf, Timeout) \
     struct Name \
     { \
@@ -35,7 +47,7 @@
             static const std::string s{#Name}; \
             return s; \
         } \
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::milliseconds{2000}; } \
+        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::milliseconds{7000}; } \
     };\
 
 #define SIGNAL(Name, Itf, ArgType) \

=== modified file 'src/core/media/mpris/player.h'
--- src/core/media/mpris/player.h	2014-04-25 17:53:00 +0000
+++ src/core/media/mpris/player.h	2014-07-10 12:20:07 +0000
@@ -48,7 +48,7 @@
 
     METHOD(Next, Player, std::chrono::seconds(1))
     METHOD(Previous, Player, std::chrono::seconds(1))
-    METHOD(Pause, Player, std::chrono::seconds(1))
+    METHOD_WITH_TIMEOUT_MS(Pause, Player, 1000)
     METHOD(PlayPause, Player, std::chrono::seconds(1))
     METHOD(Stop, Player, std::chrono::seconds(1))
     METHOD(Play, Player, std::chrono::seconds(1))