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

moved max() function and added min() function

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3795 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2003-07-01 20:57:42 +00:00
parent 76aa3218cb
commit 6c8c941ac3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/mixer/MixerInput.cpp
-2
View File
@@ -8,8 +8,6 @@
#include "ByteSwap.h" #include "ByteSwap.h"
#include "debug.h" #include "debug.h"
template<class t> const t & max(const t &t1, const t &t2) { return (t1 > t2) ? t1 : t2; }
MixerInput::MixerInput(MixerCore *core, const media_input &input, float mixFrameRate, int32 mixFrameCount) MixerInput::MixerInput(MixerCore *core, const media_input &input, float mixFrameRate, int32 mixFrameCount)
: fCore(core), : fCore(core),
fInput(input), fInput(input),
src/add-ons/media/media-add-ons/mixer/MixerUtils.h
+3
View File
@@ -7,6 +7,9 @@
#define PRINT_CHANNEL_MASK(fmt) ((void)0) #define PRINT_CHANNEL_MASK(fmt) ((void)0)
#endif #endif
template<class t> const t & max(const t &t1, const t &t2) { return (t1 > t2) ? t1 : t2; }
template<class t> const t & min(const t &t1, const t &t2) { return (t1 < t2) ? t1 : t2; }
void string_for_channel_mask(char *str, uint32 mask); void string_for_channel_mask(char *str, uint32 mask);
void fix_multiaudio_format(media_multi_audio_format *format); void fix_multiaudio_format(media_multi_audio_format *format);