moved max() function and added min() function
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3795 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
76aa3218cb
commit
6c8c941ac3
@ -8,8 +8,6 @@
|
||||
#include "ByteSwap.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)
|
||||
: fCore(core),
|
||||
fInput(input),
|
||||
|
@ -7,6 +7,9 @@
|
||||
#define PRINT_CHANNEL_MASK(fmt) ((void)0)
|
||||
#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 fix_multiaudio_format(media_multi_audio_format *format);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user