Date: Sat, 13 Sep 2003 15:50:43 +0300
authorSam Lantinga <slouken@libsdl.org>
Sun, 21 Sep 2003 18:15:31 +0000
changeset 23466cd2595e4dd
parent 233 ec3036d25d47
child 235 bdfad81062fa
Date: Sat, 13 Sep 2003 15:50:43 +0300
From: "Mike Gorchak"
Subject: QNX fixes

updated .qpg file and fixed error in .mod samples parsing. sdl_mixer core dumped, tried to load the us-boy.mod (included in the attachment). I saw, many mod players have a similar hack for the looping in the samples, so I added the same one to mikmod code :)
SDL_mixer.qpg.in
mikmod/virtch_common.c
     1.1 --- a/SDL_mixer.qpg.in	Thu Sep 18 10:44:08 2003 +0000
     1.2 +++ b/SDL_mixer.qpg.in	Sun Sep 21 18:15:31 2003 +0000
     1.3 @@ -37,6 +37,7 @@
     1.4        </QPG:Files>
     1.5        <QPG:PackageFilter>
     1.6           <QPM:PackageManifest>
     1.7 +
     1.8              <QPM:PackageDescription>
     1.9                 <QPM:PackageType>Library</QPM:PackageType>
    1.10                 <QPM:PackageName>SDL_mixer</QPM:PackageName>
    1.11 @@ -44,6 +45,7 @@
    1.12                 <QPM:PackageRepository>http://qnx.org.ru/repository</QPM:PackageRepository>
    1.13                 <QPM:FileVersion>2.0</QPM:FileVersion>
    1.14              </QPM:PackageDescription>
    1.15 +
    1.16              <QPM:ProductDescription>
    1.17                 <QPM:ProductName>SDL_mixer</QPM:ProductName>
    1.18                 <QPM:ProductIdentifier>SDL_mixer</QPM:ProductIdentifier>
    1.19 @@ -53,17 +55,18 @@
    1.20                 <QPM:VendorURL>http://www.libsdl.org</QPM:VendorURL>
    1.21                 <QPM:VendorEmbedURL/>
    1.22                 <QPM:VendorEmail>slouken@libsdl.org</QPM:VendorEmail>
    1.23 -               <QPM:AuthorName>Sam Lantinga</QPM:AuthorName>
    1.24 +               <QPM:AuthorName>Sam Lantinga, Stephane Peter and Ryan Gordon</QPM:AuthorName>
    1.25                 <QPM:AuthorURL>http://www.libsdl.org</QPM:AuthorURL>
    1.26                 <QPM:AuthorEmbedURL/>
    1.27                 <QPM:AuthorEmail>slouken@libsdl.org</QPM:AuthorEmail>
    1.28                 <QPM:ProductIconSmall/>
    1.29                 <QPM:ProductIconLarge/>
    1.30 -               <QPM:ProductDescriptionShort>SDL_mixer - is simple multi-channel audio mixer. The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, and can load MIDI files via Timidity and the following music formats via MikMod: .MOD .S3M .IT .XM.</QPM:ProductDescriptionShort>
    1.31 +               <QPM:ProductDescriptionShort>SDL_mixer - is simple multi-channel audio mixer. The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, and can load MIDI files via Timidity and the various music formats via MikMod.</QPM:ProductDescriptionShort>
    1.32                 <QPM:ProductDescriptionLong>SDL_mixer - is simple multi-channel audio mixer. The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, and can load MIDI files via Timidity and the following music formats via MikMod: .MOD .S3M .IT .XM.</QPM:ProductDescriptionLong>
    1.33 -               <QPM:ProductDescriptionURL>http://www.libsdl.org</QPM:ProductDescriptionURL>
    1.34 +               <QPM:ProductDescriptionURL>http://www.libsdl.org/projects/SDL_mixer</QPM:ProductDescriptionURL>
    1.35                 <QPM:ProductDescriptionEmbedURL/>
    1.36              </QPM:ProductDescription>
    1.37 +
    1.38              <QPM:ReleaseDescription>
    1.39                 <QPM:ReleaseVersion>@VERSION@</QPM:ReleaseVersion>
    1.40                 <QPM:ReleaseUrgency>High</QPM:ReleaseUrgency>
    1.41 @@ -72,26 +75,53 @@
    1.42                 <QPM:ReleaseNoteMajor/>
    1.43                 <QPM:ReleaseBuild>1</QPM:ReleaseBuild>
    1.44                 <QPM:CountryExclude/>
    1.45 -               <QPM:ReleaseCopyright>GNU General Public License</QPM:ReleaseCopyright>
    1.46 +               <QPM:ReleaseCopyright>GNU Lesser General Public License</QPM:ReleaseCopyright>
    1.47              </QPM:ReleaseDescription>
    1.48 +
    1.49              <QPM:ContentDescription>
    1.50 -               <QPM:ContentTopic>Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
    1.51 +               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
    1.52                 <QPM:ContentKeyword>SDL, music, sound, WAV, VOC, MIDI, MID, MOD, S3M, XM, IT</QPM:ContentKeyword>
    1.53 -               <QPM:Processor/>
    1.54 -               <QPM:TargetProcessor/>
    1.55                 <QPM:TargetOS>qnx6</QPM:TargetOS>
    1.56 -               <QPM:HostOS>qnx6</QPM:HostOS>
    1.57 -               <QPM:DisplayEnvironment>Console</QPM:DisplayEnvironment>
    1.58 -               <QPM:TargetAudience>Developer</QPM:TargetAudience>
    1.59 -               <QPM:TargetAudience>User</QPM:TargetAudience>
    1.60 +               <QPM:HostOS>none</QPM:HostOS>
    1.61 +               <QPM:DisplayEnvironment xmlmultiple="true">Console</QPM:DisplayEnvironment>
    1.62 +               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
    1.63 +               <QPM:TargetAudience xmlmultiple="true">User</QPM:TargetAudience>
    1.64              </QPM:ContentDescription>
    1.65              <QPM:LicenseUrl>repdata://LicenseUrl/COPYING</QPM:LicenseUrl>
    1.66 +         </QPM:PackageManifest>
    1.67 +      </QPG:PackageFilter>
    1.68 +
    1.69 +      <QPG:PackageFilter proc="none" target="none">
    1.70 +         <QPM:PackageManifest>
    1.71              <QPM:ProductInstallationDependencies>
    1.72 -               <QPM:ProductRequirements/>
    1.73 +               <QPM:ProductRequirements></QPM:ProductRequirements>
    1.74              </QPM:ProductInstallationDependencies>
    1.75           </QPM:PackageManifest>
    1.76        </QPG:PackageFilter>
    1.77 +
    1.78 +      <QPG:PackageFilter proc="x86" target="none">
    1.79 +         <QPM:PackageManifest>
    1.80 +            <QPM:ProductInstallationDependencies>
    1.81 +               <QPM:ProductRequirements></QPM:ProductRequirements>
    1.82 +            </QPM:ProductInstallationDependencies>
    1.83 +         </QPM:PackageManifest>
    1.84 +      </QPG:PackageFilter>
    1.85 +
    1.86 +      <QPG:PackageFilter proc="none" target="x86">
    1.87 +         <QPM:PackageManifest>
    1.88 +            <QPM:ProductInstallationDependencies>
    1.89 +               <QPM:ProductRequirements></QPM:ProductRequirements>
    1.90 +            </QPM:ProductInstallationDependencies>
    1.91 +         </QPM:PackageManifest>
    1.92 +      </QPG:PackageFilter>
    1.93 +
    1.94 +      <QPG:PackageFilter proc="x86" target="x86">
    1.95 +         <QPM:PackageManifest>
    1.96 +            <QPM:ProductInstallationDependencies>
    1.97 +               <QPM:ProductRequirements></QPM:ProductRequirements>
    1.98 +            </QPM:ProductInstallationDependencies>
    1.99 +         </QPM:PackageManifest>
   1.100 +      </QPG:PackageFilter>
   1.101 +
   1.102     </QPG:Values>
   1.103  </QPG:Generation>
   1.104 -
   1.105 -
     2.1 --- a/mikmod/virtch_common.c	Thu Sep 18 10:44:08 2003 +0000
     2.2 +++ b/mikmod/virtch_common.c	Sun Sep 21 18:15:31 2003 +0000
     2.3 @@ -374,6 +374,12 @@
     2.4  	length    = s->length;
     2.5  	loopstart = s->loopstart;
     2.6  	loopend   = s->loopend;
     2.7 +        
     2.8 +        /* Fix loops */
     2.9 +        if (((loopend-loopstart)>2) && (loopstart > loopend) && (loopstart>length))
    2.10 +        {
    2.11 +            loopstart /= 2;
    2.12 +        }
    2.13  
    2.14  	SL_SampleSigned(sload);
    2.15  	SL_Sample8to16(sload);