hrev52427 adds 3 changesets to branch 'master'
old head: c6be458e6d47841cff468ab608ef58b84016b824
new head: 62081a2ccad72bc5fee7c5d9ee895334ef514a08
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=62081a2ccad7+%5Ec6be458e6d47
----------------------------------------------------------------------------
488f2717d966: Remove module_audio_driver from buildsystem
c13b6a683d12: audio: Move private opensound API to audio private headers
62081a2ccad7: audio: Move hmulti_audio driver API to private audio headers
* Fix all drivers to don't access private media headers.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
16 files changed, 13 insertions(+), 14 deletions(-)
headers/private/{media => audio}/hmulti_audio.h | 0
headers/private/{media => audio}/soundcard.h | 0
src/add-ons/kernel/drivers/audio/Jamfile | 1 -
src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ac97/geode/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ac97/ich/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/emuxki/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/hda/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/ice1712/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/null/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/sb16/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/usb/Jamfile | 2 +-
src/add-ons/media/media-add-ons/opensound/Jamfile | 2 +-
############################################################################
Commit: 488f2717d9665fea2580af25594a7b6198facad5
URL: https://git.haiku-os.org/haiku/commit/?id=488f2717d966
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Tue Oct 23 14:25:10 2018 UTC
Remove module_audio_driver from buildsystem
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/audio/Jamfile
b/src/add-ons/kernel/drivers/audio/Jamfile
index 470af641eb..5205c75c00 100644
--- a/src/add-ons/kernel/drivers/audio/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/Jamfile
@@ -6,7 +6,6 @@ SubInclude HAIKU_TOP src add-ons kernel drivers audio echo ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio emuxki ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio hda ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio ice1712 ;
-SubInclude HAIKU_TOP src add-ons kernel drivers audio module_driver ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio null ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio sb16 ;
SubInclude HAIKU_TOP src add-ons kernel drivers audio usb ;
############################################################################
Commit: c13b6a683d12c88d669fc93ceac6f503cf700742
URL: https://git.haiku-os.org/haiku/commit/?id=c13b6a683d12
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Tue Oct 23 14:27:29 2018 UTC
audio: Move private opensound API to audio private headers
----------------------------------------------------------------------------
diff --git a/headers/private/media/soundcard.h
b/headers/private/audio/soundcard.h
similarity index 100%
rename from headers/private/media/soundcard.h
rename to headers/private/audio/soundcard.h
diff --git a/src/add-ons/media/media-add-ons/opensound/Jamfile
b/src/add-ons/media/media-add-ons/opensound/Jamfile
index 9adb10cdb2..ca31232e24 100644
--- a/src/add-ons/media/media-add-ons/opensound/Jamfile
+++ b/src/add-ons/media/media-add-ons/opensound/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons media media-add-ons opensound ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
############################################################################
Revision: hrev52427
Commit: 62081a2ccad72bc5fee7c5d9ee895334ef514a08
URL: https://git.haiku-os.org/haiku/commit/?id=62081a2ccad7
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Tue Oct 23 14:33:19 2018 UTC
audio: Move hmulti_audio driver API to private audio headers
* Fix all drivers to don't access private media headers.
----------------------------------------------------------------------------
diff --git a/headers/private/media/hmulti_audio.h
b/headers/private/audio/hmulti_audio.h
similarity index 100%
rename from headers/private/media/hmulti_audio.h
rename to headers/private/audio/hmulti_audio.h
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile
index de1981308a..a1bbedb735 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/auich/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auich ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateKernelHeaders ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile
index 0c9e49f4cd..c1be41dc2f 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/Jamfile
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 auvia ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
UsePrivateSystemHeaders ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile
index a73322ecbf..92a56d4ae8 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 es1370 ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders libroot media system ;
+UsePrivateHeaders libroot audio system ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
KernelAddon es1370 :
diff --git a/src/add-ons/kernel/drivers/audio/ac97/geode/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/geode/Jamfile
index f2225c6d75..c1b339e7dc 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/geode/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/geode/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 geode ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/ich/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/ich/Jamfile
index 75eb5e30d6..d2484215bd 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/ich/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/ich/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ich ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders libroot media ;
+UsePrivateHeaders libroot audio ;
KernelAddon ich_ac97 :
ac97_multi.c
diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
index b3bf580735..c3e8763097 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 sis7018 ;
UsePrivateKernelHeaders ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
UsePrivateHeaders [ FDirName kernel util ] ;
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/Jamfile
b/src/add-ons/kernel/drivers/audio/emuxki/Jamfile
index b8a972d138..37b8892fb5 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/emuxki/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio emuxki ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateSystemHeaders ;
-UsePrivateHeaders media device ;
+UsePrivateHeaders audio device ;
KernelAddon emuxki :
ac97.c
diff --git a/src/add-ons/kernel/drivers/audio/hda/Jamfile
b/src/add-ons/kernel/drivers/audio/hda/Jamfile
index bb931d4295..a4a7ed44ee 100644
--- a/src/add-ons/kernel/drivers/audio/hda/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/hda/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio hda ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateKernelHeaders ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
KernelAddon hda :
driver.cpp
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/Jamfile
b/src/add-ons/kernel/drivers/audio/ice1712/Jamfile
index 70d5e8f691..9391f79b95 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ice1712/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ice1712 ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateKernelHeaders ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
KernelAddon ice1712 :
ice1712.cpp
diff --git a/src/add-ons/kernel/drivers/audio/null/Jamfile
b/src/add-ons/kernel/drivers/audio/null/Jamfile
index de60b785e0..92871050c3 100644
--- a/src/add-ons/kernel/drivers/audio/null/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/null/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio null ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
KernelAddon null_audio :
driver.c
diff --git a/src/add-ons/kernel/drivers/audio/sb16/Jamfile
b/src/add-ons/kernel/drivers/audio/sb16/Jamfile
index f7a33a68ca..57fbf35d7a 100644
--- a/src/add-ons/kernel/drivers/audio/sb16/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/sb16/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio sb16 ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders media ;
+UsePrivateHeaders audio ;
KernelAddon sb16 :
driver.c
diff --git a/src/add-ons/kernel/drivers/audio/usb/Jamfile
b/src/add-ons/kernel/drivers/audio/usb/Jamfile
index b012a73373..c0585868b5 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/usb/Jamfile
@@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders kernel net ;
UsePrivateKernelHeaders ;
UsePrivateHeaders [ FDirName kernel util ] ;
-UsePrivateHeaders kernel media ;
+UsePrivateHeaders kernel audio ;
KernelAddon usb_audio :
Driver.cpp
