[haiku-commits] haiku: hrev53766 - headers/os/game

  • From: Adrien Destugues <pulkomandy@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 25 Jan 2020 06:42:48 -0500 (EST)

hrev53766 adds 1 changeset to branch 'master'
old head: d623ab8459581ea9a4c168b21bd69436086813ef
new head: e9d6c3150e094f40e1dfc234fe8ca00eb6065ab4
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=e9d6c3150e09+%5Ed623ab845958

----------------------------------------------------------------------------

e9d6c3150e09: Game Kit: rewrite StreamingGameSound.h
  
  Change-Id: Ibd5d77236dc14ca605b0925c1177e64ca9e5a5d3
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/2113
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>

                                          [ Ra-V2 <rav.bernacki@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev53766
Commit:      e9d6c3150e094f40e1dfc234fe8ca00eb6065ab4
URL:         https://git.haiku-os.org/haiku/commit/?id=e9d6c3150e09
Author:      Ra-V2 <rav.bernacki@xxxxxxxxx>
Date:        Tue Jan 14 10:06:00 2020 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Sat Jan 25 11:42:41 2020 UTC

----------------------------------------------------------------------------

1 file changed, 60 insertions(+), 60 deletions(-)
headers/os/game/StreamingGameSound.h | 120 +++++++++++++++----------------

----------------------------------------------------------------------------

diff --git a/headers/os/game/StreamingGameSound.h 
b/headers/os/game/StreamingGameSound.h
index 17f97f7b9c..265c1703be 100644
--- a/headers/os/game/StreamingGameSound.h
+++ b/headers/os/game/StreamingGameSound.h
@@ -1,91 +1,91 @@
 /*
- *  Copyright 2001-2002, Haiku Inc. All Rights Reserved.
+ *  Copyright 2020 Haiku, Inc. All Rights Reserved.
  *  Distributed under the terms of the MIT License.
  *
  * Author:
  *             Christopher ML Zumwalt May (zummy@xxxxxxxxxxxx)
  */
+
 #ifndef _STREAMINGGAMESOUND_H
 #define _STREAMINGGAMESOUND_H
 
 
-#include <SupportDefs.h>
 #include <GameSound.h>
 #include <Locker.h>
+#include <SupportDefs.h>
 
 
-class BStreamingGameSound : public BGameSound {
+class BStreamingGameSound : public BGameSound
+{
 public:
-                                                               
BStreamingGameSound(size_t bufferFrameCount,
-                                                                       const 
gs_audio_format* format,
-                                                                       size_t 
bufferCount = 2,
-                                                                       
BGameSoundDevice* device = NULL);
+                                               BStreamingGameSound(size_t 
bufferFrameCount,
+                                                       const gs_audio_format* 
format,
+                                                       size_t bufferCount = 2,
+                                                       BGameSoundDevice* 
device = NULL);
 
-       virtual                                         ~BStreamingGameSound();
+       virtual                         ~BStreamingGameSound();
 
-       virtual BGameSound*                     Clone() const;
+       virtual BGameSound*     Clone() const;
 
-       virtual status_t                        SetStreamHook(void 
(*hook)(void* cookie,
-                                                                               
void* buffer, size_t byteCount,
-                                                                               
BStreamingGameSound* me),
-                                                                       void* 
cookie);
-       virtual void                            FillBuffer(void* buffer, size_t 
byteCount);
+       virtual status_t        SetStreamHook(hook h, void* cookie);
 
-       virtual status_t                        SetAttributes(gs_attribute* 
attributes,
-                                                                       size_t 
attributeCount);
+       virtual void            FillBuffer(void* buffer, size_t byteCount);
 
-       virtual status_t                        Perform(int32 selector, void* 
data);
+       virtual status_t        SetAttributes(gs_attribute* attributes,
+                                                       size_t attributeCount);
+
+       virtual status_t        Perform(int32 selector, void* data);
+
+       typedef void            (*hook)(void* cookie, void* buffer, size_t 
byteCount,
+                                                       BStreamingGameSound* 
me);
 
 protected:
-                                                               
BStreamingGameSound(BGameSoundDevice* device);
+                                               
BStreamingGameSound(BGameSoundDevice* device);
 
-       virtual status_t                        SetParameters(size_t 
bufferFrameCount,
-                                                                       const 
gs_audio_format* format,
-                                                                       size_t 
bufferCount);
+       virtual status_t        SetParameters(size_t bufferFrameCount,
+                                                       const gs_audio_format* 
format,
+                                                       size_t bufferCount);
 
-                       bool                            Lock();
-                       void                            Unlock();
+                       bool            Lock();
+                       void            Unlock();
 
 private:
-                                                               
BStreamingGameSound();
-                                                               
BStreamingGameSound(
-                                                                       const 
BStreamingGameSound& other);
-                       BStreamingGameSound& operator=(const 
BStreamingGameSound& other);
-                                                                       // not 
implemented
-
-       virtual status_t                        
_Reserved_BStreamingGameSound_0(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_1(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_2(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_3(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_4(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_5(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_6(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_7(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_8(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_9(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_10(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_11(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_12(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_13(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_14(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_15(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_16(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_17(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_18(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_19(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_20(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_21(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_22(int32 arg,...);
-       virtual status_t                        
_Reserved_BStreamingGameSound_23(int32 arg,...);
+                                               BStreamingGameSound();
+                                               BStreamingGameSound(const 
BStreamingGameSound& other);
+                                               BStreamingGameSound&
+                                                       operator=(const 
BStreamingGameSound& other);
+
+       virtual status_t        _Reserved_BStreamingGameSound_0(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_1(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_2(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_3(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_4(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_5(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_6(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_7(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_8(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_9(int32 arg, ...);
+       virtual status_t        _Reserved_BStreamingGameSound_10(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_11(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_12(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_13(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_14(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_15(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_16(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_17(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_18(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_19(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_20(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_21(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_22(int32 arg, 
...);
+       virtual status_t        _Reserved_BStreamingGameSound_23(int32 arg, 
...);
 
 private:
-                       void                            (*fStreamHook)(void* 
cookie, void* buffer,
-                                                                       size_t 
bytes, BStreamingGameSound* sound);
-                       void*                           fStreamCookie;
-                       BLocker                         fLock;
+                       hook            fStreamHook;
+                       void*           fStreamCookie;
+                       BLocker         fLock;
 
-                       uint32                          _reserved[12];
+                       uint32          _reserved[12];
 };
 
-
-#endif // _STREAMING_GAME_SOUND_H
+#endif


Other related posts:

  • » [haiku-commits] haiku: hrev53766 - headers/os/game - Adrien Destugues