← Back to branch summary

~ubuntu-branches/ubuntu/saucy/lordsawar/saucy

« back to all changes in this revision

Viewing changes to src/sound.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese, Barry deFreese
  • Date: 2008-12-20 13:52:12 UTC
  • mfrom: (1.1.6 upstream) (5.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081220135212-noeb2w3y98ebo7o9
Tags: 0.1.4-1
[ Barry deFreese ]
* New upstream release.
* Move 0.0.8-2.1 changelog entry to correct point in changelog.
* Make lordsawar-data suggest lordsawar.
* Update my e-mail address.
* Add build-depends on intltool, uuid-dev, and libboost-dev.
* Don't install locales since there are no translations currently.
* Add simple man page for new lordsawar-pbm binary.
* Drop gcc4.3 patches as they have been fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sound.cpp
24
24
#include <iostream>
25
25
#include <sigc++/functors/mem_fun.h>
26
26
#include "sound.h"
27
 
#include "defs.h"
28
27
#include "File.h"
29
28
#include "Configuration.h"
 
29
#include "defs.h"
30
30
 
31
31
#define debug(x) {std::cerr<<__FILE__<<": "<<__LINE__<<": "<<x<<std::endl<<std::flush;}
32
32
//#define debug(x)
88
88
 
89
89
    if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024) == -1)
90
90
    {
91
 
        std::cerr <<_("Couldn't initialize SDL-mixer\n");
 
91
        std::cerr << "Couldn't initialize SDL-mixer\n";
92
92
        std::cerr <<Mix_GetError() <<std::endl;
93
93
        d_broken = true;
94
94
        return;
99
99
 
100
100
    if (!helper.parse())
101
101
    {
102
 
        std::cerr<<_("Error loading music descriptions; disable music\n");
 
102
        std::cerr<< "Error loading music descriptions; disable music\n";
103
103
        d_broken = true;
104
104
        Mix_CloseAudio();
105
105
        return;