From 71fd0e57cdbcf6e6de0debf7780001a6f8a0b5ff Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Wed, 7 Aug 2013 16:22:36 -0300 Subject: [PATCH] qa-monitor: remove reference to the runner qa-monitor implements qa-reporter, and we already have a runner stored there. --- validate/gst/qa/gst-qa-monitor.c | 7 ++----- validate/gst/qa/gst-qa-monitor.h | 5 ++--- validate/gst/qa/gst-qa-reporter.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/validate/gst/qa/gst-qa-monitor.c b/validate/gst/qa/gst-qa-monitor.c index 87b14f7..f7729de 100644 --- a/validate/gst/qa/gst-qa-monitor.c +++ b/validate/gst/qa/gst-qa-monitor.c @@ -20,7 +20,6 @@ */ #include "gst-qa-monitor.h" -#include "gst-qa-reporter.h" /** * SECTION:gst-qa-monitor @@ -253,10 +252,8 @@ gst_qa_monitor_set_property (GObject * object, guint prop_id, (GST_OBJECT_NAME (monitor->target))); break; case PROP_RUNNER: - /* we assume the runner is valid as long as this monitor is, - * no ref taken */ - monitor->runner = g_value_get_object (value); - gst_qa_reporter_set_runner (GST_QA_REPORTER (monitor), monitor->runner); + gst_qa_reporter_set_runner (GST_QA_REPORTER (monitor), + g_value_get_object (value)); break; case PROP_QA_PARENT: monitor->parent = g_value_get_object (value); diff --git a/validate/gst/qa/gst-qa-monitor.h b/validate/gst/qa/gst-qa-monitor.h index ecf9052..f97bcb6 100644 --- a/validate/gst/qa/gst-qa-monitor.h +++ b/validate/gst/qa/gst-qa-monitor.h @@ -25,6 +25,7 @@ #include #include #include "gst-qa-report.h" +#include "gst-qa-reporter.h" #include "gst-qa-runner.h" #include "gst-qa-override.h" @@ -40,7 +41,7 @@ G_BEGIN_DECLS #define GST_QA_MONITOR_CLASS_CAST(klass) ((GstQaMonitorClass*)(klass)) #define GST_QA_MONITOR_GET_OBJECT(m) (GST_QA_MONITOR_CAST (m)->target) -#define GST_QA_MONITOR_GET_RUNNER(m) (GST_QA_MONITOR_CAST (m)->runner) +#define GST_QA_MONITOR_GET_RUNNER(m) (gst_qa_reporter_get_runner (GST_QA_REPORTER_CAST (m))) #define GST_QA_MONITOR_GET_PARENT(m) (GST_QA_MONITOR_CAST (m)->parent) #define GST_QA_MONITOR_LOCK(m) (g_mutex_lock (&GST_QA_MONITOR_CAST(m)->mutex)) #define GST_QA_MONITOR_UNLOCK(m) (g_mutex_unlock (&GST_QA_MONITOR_CAST(m)->mutex)) @@ -73,8 +74,6 @@ struct _GstQaMonitor { GstQaMonitor *parent; - GstQaRunner *runner; - GMutex overrides_mutex; GQueue overrides; diff --git a/validate/gst/qa/gst-qa-reporter.h b/validate/gst/qa/gst-qa-reporter.h index c47db41..0125c46 100644 --- a/validate/gst/qa/gst-qa-reporter.h +++ b/validate/gst/qa/gst-qa-reporter.h @@ -34,6 +34,7 @@ typedef struct _GstQaReporterInterface GstQaReporterInterface; #define GST_QA_REPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_QA_REPORTER, GstQaReporter)) #define GST_IS_QA_REPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_QA_REPORTER)) #define GST_QA_REPORTER_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_QA_REPORTER, GstQaReporterInterface)) +#define GST_QA_REPORTER_CAST(obj) ((GstQaReporter *) obj) #ifdef G_HAVE_ISO_VARARGS #define GST_QA_REPORT(m, issue_id, ...) \ -- 2.7.4