[PATCH 1/5] qasf: Switch to the quartz debug channel.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
We have a (growing!) number of DirectShow channels, and it's rare that I've ever
found a reason to want any less than all of them in a log. Specifying them all
is getting tiring, so let's collapse it down to a single channel.

dlls/qasf/asfreader.c  | 2 +-
 dlls/qasf/dmowrapper.c | 2 +-
 dlls/qasf/qasf_main.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c
index 372d03a3902..a037728079f 100644
--- a/dlls/qasf/asfreader.c
+++ b/dlls/qasf/asfreader.c
@@ -20,7 +20,7 @@

#include "qasf_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qasf);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct asf_reader
 {
diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c
index ec01e79822e..54581b48bee 100644
--- a/dlls/qasf/dmowrapper.c
+++ b/dlls/qasf/dmowrapper.c
@@ -20,7 +20,7 @@

#include "qasf_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qasf);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct buffer
 {
diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c
index 4e8319c34b1..d32a9da12b5 100644
--- a/dlls/qasf/qasf_main.c
+++ b/dlls/qasf/qasf_main.c
@@ -20,7 +20,7 @@

#include "qasf_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qasf);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct class_factory
 {

[PATCH 2/5] qcap: Switch to the quartz debug channel.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/qcap/audiorecord.c    | 2 +-
 dlls/qcap/avico.c          | 2 +-
 dlls/qcap/avimux.c         | 2 +-
 dlls/qcap/capturegraph.c   | 2 +-
 dlls/qcap/filewriter.c     | 2 +-
 dlls/qcap/qcap_main.c      | 2 +-
 dlls/qcap/smartteefilter.c | 2 +-
 dlls/qcap/v4l.c            | 2 +-
 dlls/qcap/vfwcapture.c     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c
index 4c5f6646953..7f759fce5f1 100644
--- a/dlls/qcap/audiorecord.c
+++ b/dlls/qcap/audiorecord.c
@@ -19,7 +19,7 @@

#include "qcap_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct {
     struct strmbase_filter filter;
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index fbcce49a441..e8a452fc7f5 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -20,7 +20,7 @@
 #include "vfw.h"
 #include "aviriff.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct {
     struct strmbase_filter filter;
diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c
index 0fcf5b8402a..5cc7d55bdf1 100644
--- a/dlls/qcap/avimux.c
+++ b/dlls/qcap/avimux.c
@@ -20,7 +20,7 @@
 #include "vfw.h"
 #include "aviriff.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

#define MAX_PIN_NO 128
 #define AVISUPERINDEX_ENTRIES 2000
diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c
index e3f047b9957..e5c7d9c1120 100644
--- a/dlls/qcap/capturegraph.c
+++ b/dlls/qcap/capturegraph.c
@@ -20,7 +20,7 @@

#include "qcap_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

/***********************************************************************
 *   ICaptureGraphBuilder & ICaptureGraphBuilder2 implementation
diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c
index 4ea1460bb26..e49e6039604 100644
--- a/dlls/qcap/filewriter.c
+++ b/dlls/qcap/filewriter.c
@@ -20,7 +20,7 @@

#include "qcap_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct file_writer
 {
diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c
index ef71947687c..ac7ac6a26aa 100644
--- a/dlls/qcap/qcap_main.c
+++ b/dlls/qcap/qcap_main.c
@@ -25,7 +25,7 @@
 #include "qcap_private.h"
 #include "rpcproxy.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

HINSTANCE qcap_instance;

diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c
index fc98666196c..9c736a40626 100644
--- a/dlls/qcap/smartteefilter.c
+++ b/dlls/qcap/smartteefilter.c
@@ -20,7 +20,7 @@

#include "qcap_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct {
     struct strmbase_filter filter;
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index ccc06194b99..82af4dba9e1 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -59,7 +59,7 @@

#ifdef HAVE_LINUX_VIDEODEV2_H

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);

static typeof(open) *video_open = open;
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 6f03a3124af..fd5434434f2 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -21,7 +21,7 @@
 #include "qcap_private.h"
 #include "winternl.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

static const struct video_capture_funcs *capture_funcs;

[PATCH 3/5] qedit: Switch to the quartz debug channel.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/qedit/main.c          | 2 +-
 dlls/qedit/mediadet.c      | 2 +-
 dlls/qedit/nullrenderer.c  | 2 +-
 dlls/qedit/samplegrabber.c | 2 +-
 dlls/qedit/timeline.c      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c
index 1ea7c14493a..652da939e37 100644
--- a/dlls/qedit/main.c
+++ b/dlls/qedit/main.c
@@ -23,7 +23,7 @@
 #include "rpcproxy.h"
 #include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 {
diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c
index bacf5208a08..cdf2ea8ee5b 100644
--- a/dlls/qedit/mediadet.c
+++ b/dlls/qedit/mediadet.c
@@ -30,7 +30,7 @@
 #include "qedit_private.h"
 #include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct MediaDetImpl {
     IUnknown IUnknown_inner;
diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index 5dc74c77809..87ef14240cd 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -24,7 +24,7 @@
 #include "wine/debug.h"
 #include "wine/strmbase.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct null_renderer
 {
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 47358f2763b..d1b974d3d5d 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -30,7 +30,7 @@
 #include "qedit_private.h"
 #include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct sample_grabber
 {
diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c
index a00ccdbefb5..3a4ed5c017e 100644
--- a/dlls/qedit/timeline.c
+++ b/dlls/qedit/timeline.c
@@ -30,7 +30,7 @@
 #include "qedit_private.h"
 #include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct {
     IUnknown IUnknown_inner;

[PATCH 4/5] qdvd: Switch to the quartz debug channel.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/qdvd/graph.c     | 2 +-
 dlls/qdvd/navigator.c | 2 +-
 dlls/qdvd/qdvd_main.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c
index 986fcc0db04..0e806313e00 100644
--- a/dlls/qdvd/graph.c
+++ b/dlls/qdvd/graph.c
@@ -20,7 +20,7 @@

#include "qdvd_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qdvd);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct graph_builder
 {
diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c
index 74bd9a3923d..2a0d013018b 100644
--- a/dlls/qdvd/navigator.c
+++ b/dlls/qdvd/navigator.c
@@ -21,7 +21,7 @@
 #include "qdvd_private.h"
 #include "wine/strmbase.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qdvd);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct navigator
 {
diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c
index 2c6430e9393..608a664e392 100644
--- a/dlls/qdvd/qdvd_main.c
+++ b/dlls/qdvd/qdvd_main.c
@@ -21,7 +21,7 @@
 #include "qdvd_private.h"
 #include "rpcproxy.h"

-WINE_DEFAULT_DEBUG_CHANNEL(qdvd);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct class_factory
 {

[PATCH 5/5] amstream: Switch to the quartz debug channel.

[Zebediah Figura]

Cc: Anton Baskanov 
Signed-off-by: Zebediah Figura 
---
Anton, as the primary contributor to amstream, I'd like to get your ACK on this.
I'm open to keeping amstream separate, or not.

dlls/amstream/audiodata.c   | 2 +-
 dlls/amstream/audiostream.c | 2 +-
 dlls/amstream/ddrawstream.c | 2 +-
 dlls/amstream/filter.c      | 2 +-
 dlls/amstream/main.c        | 2 +-
 dlls/amstream/multimedia.c  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c
index 06ed9324012..c4e32e9b179 100644
--- a/dlls/amstream/audiodata.c
+++ b/dlls/amstream/audiodata.c
@@ -25,7 +25,7 @@
 #include "winbase.h"
 #include "amstream_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

typedef struct {
     IAudioData IAudioData_iface;
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
index 77ed4072ccf..91ca0630199 100644
--- a/dlls/amstream/audiostream.c
+++ b/dlls/amstream/audiostream.c
@@ -23,7 +23,7 @@
 #include "wine/debug.h"
 #include "wine/strmbase.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

static const WCHAR sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}";

diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 150e622ad33..5e88e096991 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -24,7 +24,7 @@
 #include "wine/debug.h"
 #include "wine/strmbase.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}";

diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c
index 91a9ef4bb8a..c419bb73de7 100644
--- a/dlls/amstream/filter.c
+++ b/dlls/amstream/filter.c
@@ -23,7 +23,7 @@
 #include "wine/debug.h"
 #include "wine/list.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct enum_pins
 {
diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c
index c2c76069ea2..3d091135257 100644
--- a/dlls/amstream/main.c
+++ b/dlls/amstream/main.c
@@ -35,7 +35,7 @@

#include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

/******************************************************************************
  * Multimedia Streams ClassFactory
diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c
index 98ffc95a54a..827f9ef0363 100644
--- a/dlls/amstream/multimedia.c
+++ b/dlls/amstream/multimedia.c
@@ -28,7 +28,7 @@

#include "amstream_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);

struct multimedia_stream
 {

[PATCH 5/5] amstream: Switch to the quartz debug channel.

[Anton Baskanov]

Signed-off-by: Anton Baskanov