From 7b94a7419b4785e7c5f26bd915fc385c71fc0d5e Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Sat, 18 Feb 2006 17:34:40 +0000 Subject: [PATCH] =?UTF-8?q?Put=20sound=20into=20multimedia=20and=20rename?= =?UTF-8?q?=20it=20to=20audio=20because=20it=20is=20"MoreCorrect=C2=A9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=21144 --- reactos/drivers/drivers.rbuild | 3 --- reactos/drivers/{sound => multimedia/audio}/directory.xml | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.c | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.h | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.rc | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.xml | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/portio.c | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/readme.txt | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/sbdebug.h | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/settings.c | 0 reactos/drivers/{sound => multimedia/audio}/mpu401/test.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/card.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/dma.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/irq.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/portio.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/sbdebug.h | 0 .../drivers/{sound => multimedia/audio}/sndblst/settings.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.h | 0 .../drivers/{sound => multimedia/audio}/sndblst/sndblst.rc | 0 .../drivers/{sound => multimedia/audio}/sndblst/sndblst.xml | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/test.c | 0 reactos/drivers/{sound => multimedia/audio}/sndblst/test/sb.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/dsp.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/dsp.h | 0 reactos/drivers/{sound => multimedia/audio}/sound/in.h | 0 .../{sound => multimedia/audio}/sound/include/devices.h | 0 reactos/drivers/{sound => multimedia/audio}/sound/mixer.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/mixer.h | 0 reactos/drivers/{sound => multimedia/audio}/sound/sb16.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/sb16.h | 0 reactos/drivers/{sound => multimedia/audio}/sound/sb16.rc | 0 .../drivers/{sound => multimedia/audio}/sound/sb_waveout.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/sound.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/sound.xml | 0 reactos/drivers/{sound => multimedia/audio}/sound/wave.c | 0 reactos/drivers/{sound => multimedia/audio}/sound/wave.h | 0 reactos/drivers/multimedia/directory.xml | 4 ++++ reactos/drivers/sound/.gitignore | 0 39 files changed, 4 insertions(+), 3 deletions(-) rename reactos/drivers/{sound => multimedia/audio}/directory.xml (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.c (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.h (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.rc (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/mpu401.xml (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/portio.c (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/readme.txt (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/sbdebug.h (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/settings.c (100%) rename reactos/drivers/{sound => multimedia/audio}/mpu401/test.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/card.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/dma.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/irq.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/portio.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/sbdebug.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/settings.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.rc (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/sndblst.xml (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/test.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sndblst/test/sb.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/dsp.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/dsp.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/in.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/include/devices.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/mixer.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/mixer.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sb16.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sb16.h (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sb16.rc (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sb_waveout.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sound.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/sound.xml (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/wave.c (100%) rename reactos/drivers/{sound => multimedia/audio}/sound/wave.h (100%) delete mode 100644 reactos/drivers/sound/.gitignore diff --git a/reactos/drivers/drivers.rbuild b/reactos/drivers/drivers.rbuild index 62c701ad06c..ac42fb663fc 100644 --- a/reactos/drivers/drivers.rbuild +++ b/reactos/drivers/drivers.rbuild @@ -20,9 +20,6 @@ - - - diff --git a/reactos/drivers/sound/directory.xml b/reactos/drivers/multimedia/audio/directory.xml similarity index 100% rename from reactos/drivers/sound/directory.xml rename to reactos/drivers/multimedia/audio/directory.xml diff --git a/reactos/drivers/sound/mpu401/mpu401.c b/reactos/drivers/multimedia/audio/mpu401/mpu401.c similarity index 100% rename from reactos/drivers/sound/mpu401/mpu401.c rename to reactos/drivers/multimedia/audio/mpu401/mpu401.c diff --git a/reactos/drivers/sound/mpu401/mpu401.h b/reactos/drivers/multimedia/audio/mpu401/mpu401.h similarity index 100% rename from reactos/drivers/sound/mpu401/mpu401.h rename to reactos/drivers/multimedia/audio/mpu401/mpu401.h diff --git a/reactos/drivers/sound/mpu401/mpu401.rc b/reactos/drivers/multimedia/audio/mpu401/mpu401.rc similarity index 100% rename from reactos/drivers/sound/mpu401/mpu401.rc rename to reactos/drivers/multimedia/audio/mpu401/mpu401.rc diff --git a/reactos/drivers/sound/mpu401/mpu401.xml b/reactos/drivers/multimedia/audio/mpu401/mpu401.xml similarity index 100% rename from reactos/drivers/sound/mpu401/mpu401.xml rename to reactos/drivers/multimedia/audio/mpu401/mpu401.xml diff --git a/reactos/drivers/sound/mpu401/portio.c b/reactos/drivers/multimedia/audio/mpu401/portio.c similarity index 100% rename from reactos/drivers/sound/mpu401/portio.c rename to reactos/drivers/multimedia/audio/mpu401/portio.c diff --git a/reactos/drivers/sound/mpu401/readme.txt b/reactos/drivers/multimedia/audio/mpu401/readme.txt similarity index 100% rename from reactos/drivers/sound/mpu401/readme.txt rename to reactos/drivers/multimedia/audio/mpu401/readme.txt diff --git a/reactos/drivers/sound/mpu401/sbdebug.h b/reactos/drivers/multimedia/audio/mpu401/sbdebug.h similarity index 100% rename from reactos/drivers/sound/mpu401/sbdebug.h rename to reactos/drivers/multimedia/audio/mpu401/sbdebug.h diff --git a/reactos/drivers/sound/mpu401/settings.c b/reactos/drivers/multimedia/audio/mpu401/settings.c similarity index 100% rename from reactos/drivers/sound/mpu401/settings.c rename to reactos/drivers/multimedia/audio/mpu401/settings.c diff --git a/reactos/drivers/sound/mpu401/test.c b/reactos/drivers/multimedia/audio/mpu401/test.c similarity index 100% rename from reactos/drivers/sound/mpu401/test.c rename to reactos/drivers/multimedia/audio/mpu401/test.c diff --git a/reactos/drivers/sound/sndblst/card.c b/reactos/drivers/multimedia/audio/sndblst/card.c similarity index 100% rename from reactos/drivers/sound/sndblst/card.c rename to reactos/drivers/multimedia/audio/sndblst/card.c diff --git a/reactos/drivers/sound/sndblst/dma.c b/reactos/drivers/multimedia/audio/sndblst/dma.c similarity index 100% rename from reactos/drivers/sound/sndblst/dma.c rename to reactos/drivers/multimedia/audio/sndblst/dma.c diff --git a/reactos/drivers/sound/sndblst/irq.c b/reactos/drivers/multimedia/audio/sndblst/irq.c similarity index 100% rename from reactos/drivers/sound/sndblst/irq.c rename to reactos/drivers/multimedia/audio/sndblst/irq.c diff --git a/reactos/drivers/sound/sndblst/portio.c b/reactos/drivers/multimedia/audio/sndblst/portio.c similarity index 100% rename from reactos/drivers/sound/sndblst/portio.c rename to reactos/drivers/multimedia/audio/sndblst/portio.c diff --git a/reactos/drivers/sound/sndblst/sbdebug.h b/reactos/drivers/multimedia/audio/sndblst/sbdebug.h similarity index 100% rename from reactos/drivers/sound/sndblst/sbdebug.h rename to reactos/drivers/multimedia/audio/sndblst/sbdebug.h diff --git a/reactos/drivers/sound/sndblst/settings.c b/reactos/drivers/multimedia/audio/sndblst/settings.c similarity index 100% rename from reactos/drivers/sound/sndblst/settings.c rename to reactos/drivers/multimedia/audio/sndblst/settings.c diff --git a/reactos/drivers/sound/sndblst/sndblst.c b/reactos/drivers/multimedia/audio/sndblst/sndblst.c similarity index 100% rename from reactos/drivers/sound/sndblst/sndblst.c rename to reactos/drivers/multimedia/audio/sndblst/sndblst.c diff --git a/reactos/drivers/sound/sndblst/sndblst.h b/reactos/drivers/multimedia/audio/sndblst/sndblst.h similarity index 100% rename from reactos/drivers/sound/sndblst/sndblst.h rename to reactos/drivers/multimedia/audio/sndblst/sndblst.h diff --git a/reactos/drivers/sound/sndblst/sndblst.rc b/reactos/drivers/multimedia/audio/sndblst/sndblst.rc similarity index 100% rename from reactos/drivers/sound/sndblst/sndblst.rc rename to reactos/drivers/multimedia/audio/sndblst/sndblst.rc diff --git a/reactos/drivers/sound/sndblst/sndblst.xml b/reactos/drivers/multimedia/audio/sndblst/sndblst.xml similarity index 100% rename from reactos/drivers/sound/sndblst/sndblst.xml rename to reactos/drivers/multimedia/audio/sndblst/sndblst.xml diff --git a/reactos/drivers/sound/sndblst/test.c b/reactos/drivers/multimedia/audio/sndblst/test.c similarity index 100% rename from reactos/drivers/sound/sndblst/test.c rename to reactos/drivers/multimedia/audio/sndblst/test.c diff --git a/reactos/drivers/sound/sndblst/test/sb.c b/reactos/drivers/multimedia/audio/sndblst/test/sb.c similarity index 100% rename from reactos/drivers/sound/sndblst/test/sb.c rename to reactos/drivers/multimedia/audio/sndblst/test/sb.c diff --git a/reactos/drivers/sound/sound/dsp.c b/reactos/drivers/multimedia/audio/sound/dsp.c similarity index 100% rename from reactos/drivers/sound/sound/dsp.c rename to reactos/drivers/multimedia/audio/sound/dsp.c diff --git a/reactos/drivers/sound/sound/dsp.h b/reactos/drivers/multimedia/audio/sound/dsp.h similarity index 100% rename from reactos/drivers/sound/sound/dsp.h rename to reactos/drivers/multimedia/audio/sound/dsp.h diff --git a/reactos/drivers/sound/sound/in.h b/reactos/drivers/multimedia/audio/sound/in.h similarity index 100% rename from reactos/drivers/sound/sound/in.h rename to reactos/drivers/multimedia/audio/sound/in.h diff --git a/reactos/drivers/sound/sound/include/devices.h b/reactos/drivers/multimedia/audio/sound/include/devices.h similarity index 100% rename from reactos/drivers/sound/sound/include/devices.h rename to reactos/drivers/multimedia/audio/sound/include/devices.h diff --git a/reactos/drivers/sound/sound/mixer.c b/reactos/drivers/multimedia/audio/sound/mixer.c similarity index 100% rename from reactos/drivers/sound/sound/mixer.c rename to reactos/drivers/multimedia/audio/sound/mixer.c diff --git a/reactos/drivers/sound/sound/mixer.h b/reactos/drivers/multimedia/audio/sound/mixer.h similarity index 100% rename from reactos/drivers/sound/sound/mixer.h rename to reactos/drivers/multimedia/audio/sound/mixer.h diff --git a/reactos/drivers/sound/sound/sb16.c b/reactos/drivers/multimedia/audio/sound/sb16.c similarity index 100% rename from reactos/drivers/sound/sound/sb16.c rename to reactos/drivers/multimedia/audio/sound/sb16.c diff --git a/reactos/drivers/sound/sound/sb16.h b/reactos/drivers/multimedia/audio/sound/sb16.h similarity index 100% rename from reactos/drivers/sound/sound/sb16.h rename to reactos/drivers/multimedia/audio/sound/sb16.h diff --git a/reactos/drivers/sound/sound/sb16.rc b/reactos/drivers/multimedia/audio/sound/sb16.rc similarity index 100% rename from reactos/drivers/sound/sound/sb16.rc rename to reactos/drivers/multimedia/audio/sound/sb16.rc diff --git a/reactos/drivers/sound/sound/sb_waveout.c b/reactos/drivers/multimedia/audio/sound/sb_waveout.c similarity index 100% rename from reactos/drivers/sound/sound/sb_waveout.c rename to reactos/drivers/multimedia/audio/sound/sb_waveout.c diff --git a/reactos/drivers/sound/sound/sound.c b/reactos/drivers/multimedia/audio/sound/sound.c similarity index 100% rename from reactos/drivers/sound/sound/sound.c rename to reactos/drivers/multimedia/audio/sound/sound.c diff --git a/reactos/drivers/sound/sound/sound.xml b/reactos/drivers/multimedia/audio/sound/sound.xml similarity index 100% rename from reactos/drivers/sound/sound/sound.xml rename to reactos/drivers/multimedia/audio/sound/sound.xml diff --git a/reactos/drivers/sound/sound/wave.c b/reactos/drivers/multimedia/audio/sound/wave.c similarity index 100% rename from reactos/drivers/sound/sound/wave.c rename to reactos/drivers/multimedia/audio/sound/wave.c diff --git a/reactos/drivers/sound/sound/wave.h b/reactos/drivers/multimedia/audio/sound/wave.h similarity index 100% rename from reactos/drivers/sound/sound/wave.h rename to reactos/drivers/multimedia/audio/sound/wave.h diff --git a/reactos/drivers/multimedia/directory.xml b/reactos/drivers/multimedia/directory.xml index 44b1757b0f1..e0441c6f0b9 100755 --- a/reactos/drivers/multimedia/directory.xml +++ b/reactos/drivers/multimedia/directory.xml @@ -1,3 +1,7 @@ + + + +