-
Notifications
You must be signed in to change notification settings - Fork 0
/
adm2.5-audioeng_buildfilters.cpp.diff
57 lines (53 loc) · 1.79 KB
/
adm2.5-audioeng_buildfilters.cpp.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
--- a/avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp 2010-04-06 05:52:04.000000000 -0700
+++ b/avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp 2012-03-16 23:07:17.000000000 -0700
@@ -95,12 +95,12 @@
RESAMPLING audioResampleMode = RESAMPLING_NONE;
CHANNEL_CONF audioMixing=CHANNEL_INVALID;
// These are globals for the moment
-//************************************
-int audioShift = 0;
-int audioDelay=0;
-//**********
+// ************************************
+int audioShift = 0;
+int audioDelay = 0;
+// **********
-const char *getCurrentMixerString(void)
+const char * getCurrentMixerString(void)
{
uint32_t nb=sizeof(Mixer_strings)/sizeof(Mixer_String);
for(uint32_t i=0;i<nb;i++)
@@ -108,29 +108,31 @@
ADM_assert(0);
}
-uint8_t setCurrentMixerFromString(const char *name)
+uint8_t setCurrentMixerFromString(const char *name)
{
uint32_t nb=sizeof(Mixer_strings)/sizeof(Mixer_String);
for(uint32_t i=0;i<nb;i++)
+ {
if(!strcasecmp(name,Mixer_strings[i].name))
{
audioMixing= Mixer_strings[i].conf;
return 1;
}
+ }
return 0;
}
-//**********
+// **********
-const char *audioSourceFromEnum(AudioSource src)
+const char * audioSourceFromEnum(AudioSource src)
{
uint32_t nb=sizeof(Sources)/sizeof(externalSource);
for(uint32_t i=0;i<nb;i++)
if(src==Sources[i].type) return Sources[i].name;
ADM_assert(0);
-
+ return NULL;
}
-AudioSource audioSourceFromString(const char *name)
+AudioSource audioSourceFromString(const char *name)
{
uint32_t nb=sizeof(Sources)/sizeof(externalSource);
for(uint32_t i=0;i<nb;i++)