Merge branch 'drm' into drm2

Author: Lord-Grey

CMakeLists.txt

@@ -210,7 +210,6 @@ elseif ("${PLATFORM}" MATCHES "windows")
 		set(DEFAULT_DX       OFF)
 	endif()
 elseif ("${PLATFORM}" MATCHES "rpi")
-    set(DEFAULT_AMLOGIC    ON)
 	set(DEFAULT_DISPMANX   ON)
 	set(DEFAULT_DEV_WS281XPWM  ON)
 elseif ("${PLATFORM}" MATCHES "^amlogic")

doc/development/qtlogging.ini

@@ -715,7 +715,7 @@ QJsonArray JsonInfo::discoverScreenInputs(const QJsonObject& params) const
 	discoverGrabber<DDAGrabber>(screenInputs, params);
 #endif
 
-#ifdef ENABLE_DRM
+#ifdef ENABLE_DRM && !defined(ENABLE_AMLOGIC)
 	discoverGrabber<DRMFrameGrabber>(screenInputs, params);
 #endif
 

libsrc/api/JsonInfo.cpp

@@ -0,0 +1,29 @@
+[Rules]
+# Trace All
+*.debug=false
+qt.*.debug=false
+
+# Memory/Object logging
+#memory.*.debug=true
+
+# Object logging
+#memory.objects.*.debug=true
+#memory.objects.create.debug=true
+#memory.objects.destroy.debug=true
+#memory.objects.track.debug=true
+
+# Object logging for static objects
+#memory.non_objects.*.debug=true
+#memory.non_objects.create.debug=true
+#memory.non_objects.destroy.debug=true
+
+# mDNS logging
+#mdns.browser.debug=true
+#mdns.provider.debug=true
+
+# Grabber logging
+#grabber.screen.*.debug=true
+#grabber.screen.drm.debug=true
+
+#grabber.video.*.debug=true
+#grabber.video.v4l2.debug=true

qtlogging.ini

@@ -57,6 +57,9 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	${MACOS_BUNDLE_RESOURCE_FILES}
 )
 
+# Disable debug output for release builds
+target_compile_definitions(${PROJECT_NAME} PRIVATE $<$<CONFIG:Release>:QT_NO_DEBUG_OUTPUT>)
+
 find_package(OpenSSL QUIET)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus QUIET)
 target_link_libraries(${PROJECT_NAME}

src/hyperiond/CMakeLists.txt

@@ -113,17 +113,17 @@ QCoreApplication* createApplication(int& argc, char* argv[])
 int main(int argc, char** argv)
 {
 	//Turn off Qt debug logging per default - to be removed when qtlogging.ini is defined
-	QLoggingCategory::setFilterRules("*.debug = false\n"
-									 "memory.*.debug = false\n");
-
+	QLoggingCategory::setFilterRules("*.debug = false");
 	qSetMessagePattern(
 		"%{time yyyy-MM-ddTHH:mm:ss.zzz} |--|                   : <TRACE> %{category}"
 		"%{if-debug} %{function}()[%{line}] TID:%{threadid}"
 	#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
 		" (%{threadname})"
 	#endif
-		"%{endif} %{message}"
-		// " << %{backtrace depth=3}"
+		"%{endif} %{message}\n"
+#if 0		
+		" << %{backtrace depth=3}"
+#endif
 	);
 
 	ErrorManager errorManager;