Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1039 for code/trunk/src/audio


Ignore:
Timestamp:
Apr 13, 2008, 8:02:38 PM (17 years ago)
Author:
rgrieder
Message:
  • train riding doesn't have to be boring
  • added some license notes
  • removed certain header dependencies in audio
  • changed order of header file inclusion in orxonox and audio (coding style guide will be updated)
Location:
code/trunk/src/audio
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/audio/AudioBuffer.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioBuffer_H__
    229#define _AudioBuffer_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
    532
    6 #include "AudioPrereqs.h"
     33#include <string>
     34
     35#include <AL/al.h>
    736
    837namespace audio
  • code/trunk/src/audio/AudioIncludes.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
     28/**
     29  @file
     30  @brief Various headers used in the audio lib. Avoid including this to
     31         increase accuracy of header file dependencies.
     32*/
     33
     34#include "AudioPrereqs.h"
     35
    136#include <iostream>
    237#include <vector>
  • code/trunk/src/audio/AudioManager.cc

    r1021 r1039  
    2727
    2828#include "AudioManager.h"
     29
     30#include <AL/alut.h>
     31
     32#include "core/Error.h"
    2933#include "core/Debug.h"
    3034
  • code/trunk/src/audio/AudioManager.h

    r1021 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioManager_H__
    229#define _AudioManager_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
     32
     33#include <vector>
     34#include <string>
    535
    636#include "core/Tickable.h"
    7 
    8 #include "AudioPrereqs.h"
    9 
    1037#include "AudioBuffer.h"
    1138#include "AudioSource.h"
  • code/trunk/src/audio/AudioSource.cc

    r790 r1039  
    2020 *
    2121 *   Author:
    22  *      ...
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
    2323 *   Co-authors:
    2424 *      ...
  • code/trunk/src/audio/AudioSource.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioSource_H__
    229#define _AudioSource_H__
    3 
    4 #include "AudioIncludes.h"
    530
    631#include "AudioPrereqs.h"
  • code/trunk/src/audio/AudioStream.cc

    r790 r1039  
    2020 *
    2121 *   Author:
    22  *      ...
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
    2323 *   Co-authors:
    2424 *      ...
    2525 *
    2626 */
    27 
    28 #include <string>
    29 
    3027#include "AudioStream.h"
    31 #include "../orxonox/core/Debug.h"
     28
     29#include "core/Debug.h"
     30#include "core/Error.h"
    3231
    3332namespace audio
  • code/trunk/src/audio/AudioStream.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioStream_H__
    229#define _AudioStream_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
    532
    6 #include "AudioPrereqs.h"
     33#include <string>
     34#include <iostream>
     35
     36#include <AL/al.h>
     37#include <vorbis/vorbisfile.h>
     38#include <vorbis/codec.h>
    739
    840namespace audio
Note: See TracChangeset for help on using the changeset viewer.