← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to intern/SoundSystem/intern/SND_DeviceManager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/SoundSystem/intern/SND_DeviceManager.cpp
3
3
 *
4
4
 * singleton for creating, switching and deleting audiodevices
5
5
 *
6
 
 * $Id: SND_DeviceManager.cpp 14444 2008-04-16 22:40:48Z hos $
 
6
 * $Id: SND_DeviceManager.cpp 19395 2009-03-24 09:09:10Z campbellbarton $
7
7
 *
8
8
 * ***** BEGIN GPL LICENSE BLOCK *****
9
9
 *
38
38
#include "SND_DeviceManager.h"
39
39
#include "SND_DependKludge.h"
40
40
#include "SND_DummyDevice.h"
41
 
#ifdef USE_FMOD
42
 
#include "SND_FmodDevice.h"
43
 
#endif
44
41
#ifdef USE_OPENAL
45
42
#include "SND_OpenALDevice.h"
46
43
#endif
51
48
#ifdef USE_OPENAL
52
49
int SND_DeviceManager::m_device_type = snd_e_openaldevice;
53
50
#else
54
 
#       ifdef USE_FMOD
55
 
int SND_DeviceManager::m_device_type = snd_e_fmoddevice;
56
 
#       else
57
51
int SND_DeviceManager::m_device_type = snd_e_dummydevice;
58
 
#       endif
59
52
#endif
60
53
 
61
54
void SND_DeviceManager::Subscribe()
115
108
        // let's create the chosen device
116
109
        switch (device_type)
117
110
        {
118
 
#ifdef USE_FMOD
119
 
        case snd_e_fmoddevice:
120
 
                {
121
 
                        m_instance = new SND_FmodDevice();
122
 
                        m_device_type = device_type;
123
 
                        break;
124
 
                }
125
 
#endif
126
111
#ifdef USE_OPENAL
127
112
        case snd_e_openaldevice:
128
113
                {