i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed multiaudio.addon to hmultiaudio.addon

Browse Source 
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
This commit is contained in:
Jérôme Duval
2006-03-14 10:45:15 +00:00
parent e78c06d170
commit 3f047e87db
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -56,7 +56,7 @@ BEOS_ADD_ONS_TRANSLATORS = STXTTranslator RTF-Translator PNGTranslator
JPEGTranslator JPEG2000Translator GIFTranslator BMPTranslator JPEGTranslator JPEG2000Translator GIFTranslator BMPTranslator
; ;
BEOS_ADD_ONS_MEDIA = mixer.media_addon legacy.media_addon 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 video_producer_demo.media_addon
; ;
BEOS_ADD_ONS_MEDIA_PLUGINS = aiff_reader mp3_decoder musepack BEOS_ADD_ONS_MEDIA_PLUGINS = aiff_reader mp3_decoder musepack
src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
+1 -1
View File
@@ -545,7 +545,7 @@ static void
make_device_names( make_device_names(
auich_dev * card) 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++] = card->name;
names[num_names] = NULL; names[num_names] = NULL;
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+1 -1
View File
@@ -435,7 +435,7 @@ static void
make_device_names( make_device_names(
auvia_dev * card) 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++] = card->name;
names[num_names] = NULL; names[num_names] = NULL;
src/add-ons/kernel/drivers/audio/echo/echo.cpp
+2 -2
View File
@@ -654,7 +654,7 @@ make_device_names(
sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards+1); sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards+1);
names[num_names++] = card->midi.name; names[num_names++] = card->midi.name;
#endif #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++] = card->name;
names[num_names] = NULL; names[num_names] = NULL;
@@ -687,7 +687,7 @@ cardbus_device_added(pci_info *info, void **cookie) {
} }
// Format device name // 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 // Lock the devices
acquire_sem(device_lock); acquire_sem(device_lock);
LIST_INSERT_HEAD((&devices), card, next); LIST_INSERT_HEAD((&devices), card, next);
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+1 -1
View File
@@ -2016,7 +2016,7 @@ make_device_names(
names[num_names++] = card->midi.name; names[num_names++] = card->midi.name;
#endif #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++] = card->name;
names[num_names] = NULL; names[num_names] = NULL;
src/add-ons/media/media-add-ons/multi_audio/Jamfile
+2 -2
View File
@@ -6,7 +6,7 @@ if $(TARGET_PLATFORM) != haiku {
SubDirC++Flags -fmultiple-symbol-spaces ; SubDirC++Flags -fmultiple-symbol-spaces ;
} }
Addon multi_audio.media_addon : media : Addon hmulti_audio.media_addon : media :
MultiAudioAddOn.cpp MultiAudioAddOn.cpp
MultiAudioDevice.cpp MultiAudioDevice.cpp
MultiAudioNode.cpp MultiAudioNode.cpp
@@ -15,6 +15,6 @@ Addon multi_audio.media_addon : media :
; ;
Package haiku-multi_audio-cvs Package haiku-multi_audio-cvs
: multi_audio.media_addon : hmulti_audio.media_addon
: boot home config add-ons media ; : boot home config add-ons media ;
src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ MultiAudioAddOn::MultiAudioAddOn(image_id image) :
CALLED(); CALLED();
fInitCheckStatus = B_NO_INIT; fInitCheckStatus = B_NO_INIT;
if(RecursiveScan("/dev/audio/multi/")!=B_OK) if(RecursiveScan("/dev/audio/hmulti/")!=B_OK)
return; return;
LoadSettings(); LoadSettings();