Browse Source

Nedko fix for JackAlsaAdapter.h bad autoformatting at rev 2798.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2855 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 16 years ago
parent
commit
4309c5ad5b
2 changed files with 9 additions and 5 deletions
  1. +8
    -4
      linux/alsa/JackAlsaAdapter.h
  2. +1
    -1
      macosx/Jackdmp.xcodeproj/project.pbxproj

+ 8
- 4
linux/alsa/JackAlsaAdapter.h View File

@@ -381,17 +381,21 @@ namespace Jack
{
short* chan16b;
for ( c = 0; c < fCardInputs; c++ )
{
chan16b = ( short* ) fInputCardChannels[c];
for ( s = 0; s < fBuffering; s++ )
fInputSoftChannels[c][s] = float ( chan16b[s] ) * ( 1.0/float ( SHRT_MAX ) );
for ( s = 0; s < fBuffering; s++ )
fInputSoftChannels[c][s] = float ( chan16b[s] ) * ( 1.0/float ( SHRT_MAX ) );
}
}
else // SND_PCM_FORMAT_S32
{
long* chan32b;
for ( c = 0; c < fCardInputs; c++ )
{
chan32b = ( long* ) fInputCardChannels[c];
for ( s = 0; s < fBuffering; s++ )
fInputSoftChannels[c][s] = float ( chan32b[s] ) * ( 1.0/float ( LONG_MAX ) );
for ( s = 0; s < fBuffering; s++ )
fInputSoftChannels[c][s] = float ( chan32b[s] ) * ( 1.0/float ( LONG_MAX ) );
}
}
break;
default :


+ 1
- 1
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -641,7 +641,7 @@
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4B5E08BF0E5B66EE00BEE4E0 /* netadapter */;
remoteGlobalIDString = 4B5E08BF0E5B66EE00BEE4E0;
remoteInfo = netadapter;
};
4B35C5540D4731D2000DE7AE /* PBXContainerItemProxy */ = {


Loading…
Cancel
Save