From 3f047e87db73f0be9b5f053735dd6691ab983f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 14 Mar 2006 10:45:15 +0000 Subject: [PATCH] renamed multiaudio.addon to hmultiaudio.addon audio/multi changed to audio/hmulti (avoid confusion with Be's audio/multi) hmultiaudio.addon won't load ich_ac97 any more (reason is it's not compatible) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16782 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 2 +- src/add-ons/kernel/drivers/audio/ac97/auich/auich.c | 2 +- src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c | 2 +- src/add-ons/kernel/drivers/audio/echo/echo.cpp | 4 ++-- src/add-ons/kernel/drivers/audio/emuxki/emuxki.c | 2 +- src/add-ons/media/media-add-ons/multi_audio/Jamfile | 4 ++-- .../media/media-add-ons/multi_audio/MultiAudioAddOn.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 5ec47cab6a..3933f66adc 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -56,7 +56,7 @@ BEOS_ADD_ONS_TRANSLATORS = STXTTranslator RTF-Translator PNGTranslator JPEGTranslator JPEG2000Translator GIFTranslator BMPTranslator ; BEOS_ADD_ONS_MEDIA = mixer.media_addon legacy.media_addon - multi_audio.media_addon tone_producer_demo.media_addon + hmulti_audio.media_addon tone_producer_demo.media_addon video_producer_demo.media_addon ; BEOS_ADD_ONS_MEDIA_PLUGINS = aiff_reader mp3_decoder musepack diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c index b3255c13d0..25f949c895 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c @@ -545,7 +545,7 @@ static void make_device_names( auich_dev * card) { - sprintf(card->name, "audio/multi/auich/%ld", card-cards+1); + sprintf(card->name, "audio/hmulti/auich/%ld", card-cards+1); names[num_names++] = card->name; names[num_names] = NULL; diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c index 3d2af133e0..aed788d552 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c @@ -435,7 +435,7 @@ static void make_device_names( auvia_dev * card) { - sprintf(card->name, "audio/multi/auvia/%ld", card-cards+1); + sprintf(card->name, "audio/hmulti/auvia/%ld", card-cards+1); names[num_names++] = card->name; names[num_names] = NULL; diff --git a/src/add-ons/kernel/drivers/audio/echo/echo.cpp b/src/add-ons/kernel/drivers/audio/echo/echo.cpp index a39ec67d64..335affcae8 100644 --- a/src/add-ons/kernel/drivers/audio/echo/echo.cpp +++ b/src/add-ons/kernel/drivers/audio/echo/echo.cpp @@ -654,7 +654,7 @@ make_device_names( sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards+1); names[num_names++] = card->midi.name; #endif - sprintf(card->name, "audio/multi/"DRIVER_NAME"/%ld", card-cards+1); + sprintf(card->name, "audio/hmulti/"DRIVER_NAME"/%ld", card-cards+1); names[num_names++] = card->name; names[num_names] = NULL; @@ -687,7 +687,7 @@ cardbus_device_added(pci_info *info, void **cookie) { } // Format device name - sprintf(card->name, "audio/multi/" DRIVER_NAME "/%ld", card->index); + sprintf(card->name, "audio/hmulti/" DRIVER_NAME "/%ld", card->index); // Lock the devices acquire_sem(device_lock); LIST_INSERT_HEAD((&devices), card, next); diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c index f31bf8f1a0..6b5f1707f5 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c +++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c @@ -2016,7 +2016,7 @@ make_device_names( names[num_names++] = card->midi.name; #endif - sprintf(card->name, "audio/multi/emuxki/%ld", card-cards+1); + sprintf(card->name, "audio/hmulti/emuxki/%ld", card-cards+1); names[num_names++] = card->name; names[num_names] = NULL; diff --git a/src/add-ons/media/media-add-ons/multi_audio/Jamfile b/src/add-ons/media/media-add-ons/multi_audio/Jamfile index 1b484ec436..ffb27b471d 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile +++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile @@ -6,7 +6,7 @@ if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; } -Addon multi_audio.media_addon : media : +Addon hmulti_audio.media_addon : media : MultiAudioAddOn.cpp MultiAudioDevice.cpp MultiAudioNode.cpp @@ -15,6 +15,6 @@ Addon multi_audio.media_addon : media : ; Package haiku-multi_audio-cvs - : multi_audio.media_addon + : hmulti_audio.media_addon : boot home config add-ons media ; diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp index 835ee4ec33..b47be99823 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp @@ -76,7 +76,7 @@ MultiAudioAddOn::MultiAudioAddOn(image_id image) : CALLED(); fInitCheckStatus = B_NO_INIT; - if(RecursiveScan("/dev/audio/multi/")!=B_OK) + if(RecursiveScan("/dev/audio/hmulti/")!=B_OK) return; LoadSettings();