← Back to branch summary

~kalon33/corsix-th/master

« back to all changes in this revision

Viewing changes to CorsixTH/Src/th_movie.h

  • Committer: corsixth.bot at gmail
  • Date: 2014-04-01 02:00:08 UTC
  • Revision ID: svn-v4:c39591fa-788f-11de-a72b-d90af8dea425:trunk:2689
Various cleanups in some C++ files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CorsixTH/Src/th_movie.h
28
28
#include <string>
29
29
#include <queue>
30
30
#include "config.h"
31
 
#include "th_gfx.h"
32
 
#include "th_sound.h"
33
31
 
34
32
#ifdef CORSIX_TH_USE_FFMPEG
35
33
#include "SDL_mixer.h"
46
44
#include <libswscale/swscale.h>
47
45
}
48
46
 
 
47
class SDL_Overlay;
 
48
class SDL_Surface;
 
49
struct SDL_mutex;
 
50
struct SDL_cond;
 
51
 
49
52
class THMoviePicture
50
53
{
51
54
public:
142
145
 
143
146
    void readStreams();
144
147
    void runVideo();
145
 
    void copyAudioToStream(Uint8 *pbStream, int iStreamSize);
 
148
    void copyAudioToStream(uint8_t *pbStream, int iStreamSize);
146
149
protected:
147
150
#ifdef CORSIX_TH_USE_FFMPEG
148
151
    int decodeAudioFrame(bool fFirst);
193
196
 
194
197
    //empty raw chunk for SDL_mixer
195
198
    Mix_Chunk* m_pChunk;
196
 
    Uint8* m_pbChunkBuffer;
 
199
    uint8_t* m_pbChunkBuffer;
197
200
 
198
201
    //SDL_mixer parameters
199
202
    int m_iChannel;