Separate logic from @media evaluator for reuse.

diff --git a/LockScreen.mm b/LockScreen.mm
index 42d8f1ebd4ad4050e1045b05378d587be0393f29..5429de0126923a20e5e72379cf3cadac66571d55 100644 (file)
--- a/LockScreen.mm
+++ b/LockScreen.mm
@@ -1028,16 +1028,24 @@ struct MediaQueryExp {
     String cache_;
 }; }
 
+bool CYHaveMediaControls() {
+    SBLockScreenView *view([[[$SBLockScreenManager sharedInstance] lockScreenViewController] lockScreenView]);
+    return view != nil && ![view mediaControlsHidden];
+    //return [[[$SBLockScreenManager sharedInstance] lockScreenViewController] isShowingMediaControls];
+}
+
+bool CYHaveNotificationList() {
+    SBLockScreenNotificationListController *controller([[[$SBLockScreenManager sharedInstance] lockScreenViewController] _notificationController]);
+    return controller != nil && [controller hasAnyContent];
+}
+
 MSHook(bool, _ZNK7WebCore19MediaQueryEvaluator4evalEPKNS_13MediaQueryExpE, WebCore::MediaQueryEvaluator *_this, WebCore::String &query) {
-    Log(query); if (false) {
-    } else if (kCFCoreFoundationVersionNumber >= 800 && StringEquals(query, "cydget-media-controls")) {
-        SBLockScreenView *view([[[$SBLockScreenManager sharedInstance] lockScreenViewController] lockScreenView]);
-        return view != nil && ![view mediaControlsHidden];
-        //return [[[$SBLockScreenManager sharedInstance] lockScreenViewController] isShowingMediaControls];
-    } else if (kCFCoreFoundationVersionNumber >= 800 && StringEquals(query, "cydget-notification-list")) {
-        SBLockScreenNotificationListController *controller([[[$SBLockScreenManager sharedInstance] lockScreenViewController] _notificationController]);
-        return controller != nil && [controller hasAnyContent];
-    } else
+    Log(query); if (false);
+    else if (kCFCoreFoundationVersionNumber >= 800 && StringEquals(query, "cydget-media-controls"))
+        return CYHaveMediaControls();
+    else if (kCFCoreFoundationVersionNumber >= 800 && StringEquals(query, "cydget-notification-list"))
+        return CYHaveNotificationList();
+    else
         return __ZNK7WebCore19MediaQueryEvaluator4evalEPKNS_13MediaQueryExpE(_this, query);
 }