hrev49391 adds 2 changesets to branch 'master'
old head: 331792160ab973084132a7fff6a611ca6f66245d
new head: 57fddf2a931f244cac056223b652866d072b10bf
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=57fddf2a931f+%5E331792160ab9
----------------------------------------------------------------------------
44cd1f48f30d: MediaKit: Move old R3 API files to legacy subdir
57fddf2a931f: AudioMixer: Remove duplicated case forgot after cleanup
[ Dario Casalinuovo <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
17 files changed, 3 insertions(+), 3 deletions(-)
src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp | 3 ---
src/kits/media/Jamfile | 3 +++
src/kits/media/{ => legacy}/OldAudioModule.cpp | 0
src/kits/media/{ => legacy}/OldAudioModule.h | 0
src/kits/media/{ => legacy}/OldAudioStream.cpp | 0
src/kits/media/{ => legacy}/OldAudioStream.h | 0
src/kits/media/{ => legacy}/OldBufferMsgs.h | 0
src/kits/media/{ => legacy}/OldBufferStream.cpp | 0
src/kits/media/{ => legacy}/OldBufferStream.h | 0
src/kits/media/{ => legacy}/OldBufferStreamManager.cpp | 0
src/kits/media/{ => legacy}/OldBufferStreamManager.h | 0
src/kits/media/{ => legacy}/OldMediaDefs.h | 0
src/kits/media/{ => legacy}/OldMediaKit.h | 0
src/kits/media/{ => legacy}/OldMediaModule.cpp | 0
src/kits/media/{ => legacy}/OldMediaModule.h | 0
src/kits/media/{ => legacy}/OldSubscriber.cpp | 0
src/kits/media/{ => legacy}/OldSubscriber.h | 0
############################################################################
Commit: 44cd1f48f30d7be47a03ccfa4d888865ff830b91
URL: http://cgit.haiku-os.org/haiku/commit/?id=44cd1f48f30d
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sat Jul 11 14:40:22 2015 UTC
MediaKit: Move old R3 API files to legacy subdir
----------------------------------------------------------------------------
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index c1e1a87..f8299db 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -16,6 +16,9 @@ if $(CHECK_MALLOC) {
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
+
+ SEARCH_SOURCE += [ FDirName $(SUBDIR) legacy ] ;
+
SharedLibrary [ MultiArchDefaultGristFiles libmedia.so ] :
# Private Media Kit
!missing_symbols.cpp
diff --git a/src/kits/media/OldAudioModule.cpp
b/src/kits/media/legacy/OldAudioModule.cpp
similarity index 100%
rename from src/kits/media/OldAudioModule.cpp
rename to src/kits/media/legacy/OldAudioModule.cpp
diff --git a/src/kits/media/OldAudioModule.h
b/src/kits/media/legacy/OldAudioModule.h
similarity index 100%
rename from src/kits/media/OldAudioModule.h
rename to src/kits/media/legacy/OldAudioModule.h
diff --git a/src/kits/media/OldAudioStream.cpp
b/src/kits/media/legacy/OldAudioStream.cpp
similarity index 100%
rename from src/kits/media/OldAudioStream.cpp
rename to src/kits/media/legacy/OldAudioStream.cpp
diff --git a/src/kits/media/OldAudioStream.h
b/src/kits/media/legacy/OldAudioStream.h
similarity index 100%
rename from src/kits/media/OldAudioStream.h
rename to src/kits/media/legacy/OldAudioStream.h
diff --git a/src/kits/media/OldBufferMsgs.h
b/src/kits/media/legacy/OldBufferMsgs.h
similarity index 100%
rename from src/kits/media/OldBufferMsgs.h
rename to src/kits/media/legacy/OldBufferMsgs.h
diff --git a/src/kits/media/OldBufferStream.cpp
b/src/kits/media/legacy/OldBufferStream.cpp
similarity index 100%
rename from src/kits/media/OldBufferStream.cpp
rename to src/kits/media/legacy/OldBufferStream.cpp
diff --git a/src/kits/media/OldBufferStream.h
b/src/kits/media/legacy/OldBufferStream.h
similarity index 100%
rename from src/kits/media/OldBufferStream.h
rename to src/kits/media/legacy/OldBufferStream.h
diff --git a/src/kits/media/OldBufferStreamManager.cpp
b/src/kits/media/legacy/OldBufferStreamManager.cpp
similarity index 100%
rename from src/kits/media/OldBufferStreamManager.cpp
rename to src/kits/media/legacy/OldBufferStreamManager.cpp
diff --git a/src/kits/media/OldBufferStreamManager.h
b/src/kits/media/legacy/OldBufferStreamManager.h
similarity index 100%
rename from src/kits/media/OldBufferStreamManager.h
rename to src/kits/media/legacy/OldBufferStreamManager.h
diff --git a/src/kits/media/OldMediaDefs.h
b/src/kits/media/legacy/OldMediaDefs.h
similarity index 100%
rename from src/kits/media/OldMediaDefs.h
rename to src/kits/media/legacy/OldMediaDefs.h
diff --git a/src/kits/media/OldMediaKit.h b/src/kits/media/legacy/OldMediaKit.h
similarity index 100%
rename from src/kits/media/OldMediaKit.h
rename to src/kits/media/legacy/OldMediaKit.h
diff --git a/src/kits/media/OldMediaModule.cpp
b/src/kits/media/legacy/OldMediaModule.cpp
similarity index 100%
rename from src/kits/media/OldMediaModule.cpp
rename to src/kits/media/legacy/OldMediaModule.cpp
diff --git a/src/kits/media/OldMediaModule.h
b/src/kits/media/legacy/OldMediaModule.h
similarity index 100%
rename from src/kits/media/OldMediaModule.h
rename to src/kits/media/legacy/OldMediaModule.h
diff --git a/src/kits/media/OldSubscriber.cpp
b/src/kits/media/legacy/OldSubscriber.cpp
similarity index 100%
rename from src/kits/media/OldSubscriber.cpp
rename to src/kits/media/legacy/OldSubscriber.cpp
diff --git a/src/kits/media/OldSubscriber.h
b/src/kits/media/legacy/OldSubscriber.h
similarity index 100%
rename from src/kits/media/OldSubscriber.h
rename to src/kits/media/legacy/OldSubscriber.h
############################################################################
Revision: hrev49391
Commit: 57fddf2a931f244cac056223b652866d072b10bf
URL: http://cgit.haiku-os.org/haiku/commit/?id=57fddf2a931f
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sat Jul 11 14:45:09 2015 UTC
AudioMixer: Remove duplicated case forgot after cleanup
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
index 55e9374..ab5d5ce 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
@@ -649,9 +649,6 @@ AudioMixer::FormatChangeRequested(const media_source
&source,
fCore->SetOutputBufferGroup(fBufferGroup);
}
- fCore->Unlock();
- return status;
-
err:
fCore->Unlock();
return status;
