← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnash/precise-proposed

« back to all changes in this revision

Viewing changes to libsound/sdl/sound_handler_sdl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad, Angel Abad, Micah Gersten
  • Date: 2010-11-28 22:18:48 UTC
  • mfrom: (3.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20101128221848-apjipwy78m13612a
Tags: 0.8.8-6ubuntu1
https://launchpad.net/bugs/682386
[ Angel Abad <angelabad@ubuntu.com> ]
* Merge from debian unstable (LP: #682386). Remaining changes:
  - Add Ubuntu flash alternatives in postinst and prerm
    + update debian/browser-plugin-gnash.postinst
    + update debian/browser-plugin-gnash.prerm

[ Micah Gersten <micahg@ubuntu.com> ]
* Only install the flash alternative in /usr/lib/mozilla/plugins as the other
  locations are deprecated
  - update debian/browser-plugin-gnash.postinst

Show diffs side-by-side

added added

removed removed

Lines of Context:
libsound/sdl/sound_handler_sdl.cpp
31
31
 
32
32
#include <vector>
33
33
#include <boost/scoped_array.hpp>
 
34
#include <boost/cstdint.hpp>
34
35
#include <SDL.h>
35
36
 
36
37
// Define this to get debugging call about pausing/unpausing audio
45
46
// http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
46
47
typedef struct{
47
48
     char rID[4];            // 'RIFF'
48
 
     long int rLen;        
 
49
     boost::uint32_t rLen;        
49
50
     char wID[4];            // 'WAVE'
50
51
     char fId[4];            // 'fmt '
51
 
     long int pcm_header_len;   // varies...
52
 
     short int wFormatTag;
53
 
     short int nChannels;      // 1,2 for stereo data is (l,r) pairs
54
 
     long int nSamplesPerSec;
55
 
     long int nAvgBytesPerSec;
56
 
     short int nBlockAlign;      
57
 
     short int nBitsPerSample;
 
52
     boost::uint32_t pcm_header_len;   // varies...
 
53
     boost::int16_t wFormatTag;
 
54
     boost::int16_t nChannels;      // 1,2 for stereo data is (l,r) pairs
 
55
     boost::uint32_t nSamplesPerSec;
 
56
     boost::uint32_t nAvgBytesPerSec;
 
57
     boost::int16_t nBlockAlign;      
 
58
     boost::int16_t nBitsPerSample;
58
59
} WAV_HDR;
59
60
 
60
61
// Chunk of wave file
61
62
// http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
62
63
typedef struct{
63
64
    char dId[4];            // 'data' or 'fact'
64
 
    long int dLen;
 
65
    boost::uint32_t dLen;
65
66
} CHUNK_HDR;
66
67
 
67
68
} // end of anonymous namespace