lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compile errors with sfRenderWindow and sfImage in CSFML

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1004 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2009-01-30 14:58:43 +00:00
parent c3687b4018
commit f044357031
47 changed files with 398 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CSFML/include/SFML/Audio/Music.h
View file

@ -30,13 +30,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
#include <SFML/Audio/SoundStatus.h>
////////////////////////////////////////////////////////////
/// sfMusic defines a big sound played using streaming,
/// so usually what we call a music :)
////////////////////////////////////////////////////////////
typedef struct sfMusic sfMusic;
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////

9
CSFML/include/SFML/Audio/Sound.h
View file

@ -29,15 +29,8 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
#include <SFML/Audio/SoundBuffer.h>
#include <SFML/Audio/SoundStatus.h>
////////////////////////////////////////////////////////////
/// sfSound defines the properties of the sound such as position,
/// volume, pitch, etc.
////////////////////////////////////////////////////////////
typedef struct sfSound sfSound;
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////

8
CSFML/include/SFML/Audio/SoundBuffer.h
View file

@ -29,13 +29,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
////////////////////////////////////////////////////////////
/// sfSoundBuffer is the low-level for loading and manipulating
/// sound buffers
////////////////////////////////////////////////////////////
typedef struct sfSoundBuffer sfSoundBuffer;
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////

9
CSFML/include/SFML/Audio/SoundBufferRecorder.h
View file

@ -29,14 +29,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
#include <SFML/Audio/SoundBuffer.h>
////////////////////////////////////////////////////////////
/// Specialized sfSoundRecorder which saves the captured
/// audio data into a sound buffer
////////////////////////////////////////////////////////////
typedef struct sfSoundBufferRecorder sfSoundBufferRecorder;
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////

7
CSFML/include/SFML/Audio/SoundRecorder.h
View file

@ -29,14 +29,9 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
#include <SFML/Audio/SoundBuffer.h>
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////
/// sfSoundRecorder is an interface for capturing sound data
////////////////////////////////////////////////////////////
typedef struct sfSoundRecorder sfSoundRecorder;
typedef sfBool (*sfSoundRecorderStartCallback)(void*); ///< Type of the callback used when starting a capture
typedef sfBool (*sfSoundRecorderProcessCallback)(const sfInt16*, size_t, void*); ///< Type of the callback used to process audio data
typedef void (*sfSoundRecorderStopCallback)(void*); ///< Type of the callback used when stopping a capture

9
CSFML/include/SFML/Audio/SoundStream.h
View file

@ -30,16 +30,9 @@
////////////////////////////////////////////////////////////
#include <SFML/Config.h>
#include <SFML/Audio/SoundStatus.h>
#include <SFML/Audio/Types.h>
////////////////////////////////////////////////////////////
/// sfSoundStream is a streamed sound, ie samples are acquired
/// while the sound is playing. Use it for big sound that would
/// require hundreds of MB in memory (see sfMusic),
/// or for streaming sound from the network
////////////////////////////////////////////////////////////
typedef struct sfSoundStream sfSoundStream;
////////////////////////////////////////////////////////////
/// sfSoundStreamChunk defines the data to fill by the
/// OnGetData callback

37
CSFML/include/SFML/Audio/Types.h Normal file
View file

@ -0,0 +1,37 @@
////////////////////////////////////////////////////////////
//
// SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008-2008 Laurent Gomila (laurent.gom@gmail.com)
//
// This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it freely,
// subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software.
// If you use this software in a product, an acknowledgment
// in the product documentation would be appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such,
// and must not be misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source distribution.
//
////////////////////////////////////////////////////////////
#ifndef SFML_AUDIO_TYPES_H
#define SFML_AUDIO_TYPES_H
typedef struct sfMusic sfMusic;
typedef struct sfSound sfSound;
typedef struct sfSoundBuffer sfSoundBuffer;
typedef struct sfSoundBufferRecorder sfSoundBufferRecorder;
typedef struct sfSoundRecorder sfSoundRecorder;
typedef struct sfSoundStream sfSoundStream;
#endif // SFML_AUDIO_TYPES_H