Changeset 677 for code/branches/FICN/src/audio

Timestamp:

Dec 23, 2007, 7:19:07 PM (17 years ago)

Author:

landauf

Message:

changed \n to std::endl

Location:

code/branches/FICN/src/audio

Files:

• AudioIncludes.h (modified) (1 diff)
• AudioStream.cc (modified) (1 diff)
• AudioStream.h (modified) (1 diff)

code/branches/FICN/src/audio/AudioIncludes.h

@@ -12 +12 @@
 
 #include "../orxonox/core/Error.h"
-

code/branches/FICN/src/audio/AudioStream.cc

@@ -105 +105 @@
                 {
             COUT(3)
-                << "version         " << vorbisInfo->version         << "\n"
-                << "channels        " << vorbisInfo->channels        << "\n"
-                << "rate (hz)       " << vorbisInfo->rate            << "\n"
-                << "bitrate upper   " << vorbisInfo->bitrate_upper   << "\n"
-                << "bitrate nominal " << vorbisInfo->bitrate_nominal << "\n"
-                << "bitrate lower   " << vorbisInfo->bitrate_lower   << "\n"
-                << "bitrate window  " << vorbisInfo->bitrate_window  << "\n"
-                << "\n"
-                << "vendor " << vorbisComment->vendor << "\n";
+                << "version         " << vorbisInfo->version         << std::endl
+                << "channels        " << vorbisInfo->channels        << std::endl
+                << "rate (hz)       " << vorbisInfo->rate            << std::endl
+                << "bitrate upper   " << vorbisInfo->bitrate_upper   << std::endl
+                << "bitrate nominal " << vorbisInfo->bitrate_nominal << std::endl
+                << "bitrate lower   " << vorbisInfo->bitrate_lower   << std::endl
+                << "bitrate window  " << vorbisInfo->bitrate_window  << std::endl
+                << std::endl
+                << "vendor " << vorbisComment->vendor << std::endl;
 
             for(int i = 0; i < vorbisComment->comments; i++)
-                COUT(3) << "   " << vorbisComment->user_comments[i] << "\n";
+                COUT(3) << "   " << vorbisComment->user_comments[i] << std::endl;
 
             COUT(3) << std::endl;

code/branches/FICN/src/audio/AudioStream.h

@@ -6 +6 @@
 namespace audio
 {
-        #define BUFFER_SIZE (4096 * 4)
-        
-        class AudioStream
-        {
-            public:
-                                        AudioStream(std::string path);
-                void open();
-                void release();
-                void display();
-                bool playback();
-                bool playing();
-                bool update();
-                                        inline bool isLoaded() { return loaded; }       
+  #define BUFFER_SIZE (4096 * 4)
 
-            protected:
-        
-                bool stream(ALuint buffer);
-                void empty();
-                void check();
-                std::string errorString(int code);
-        
-            private:
-        
-                                        std::string path;
+  class AudioStream
+  {
+    public:
+      AudioStream(std::string path);
+      void open();
+      void release();
+      void display();
+      bool playback();
+      bool playing();
+      bool update();
+      inline bool isLoaded() { return loaded; }
 
-                FILE*           oggFile;
-                OggVorbis_File  oggStream;
-                vorbis_info*    vorbisInfo;
-                vorbis_comment* vorbisComment;
-                                        bool loaded;    
+    protected:
+      bool stream(ALuint buffer);
+      void empty();
+      void check();
+      std::string errorString(int code);
 
-                ALuint buffers[2];
-                ALuint source;
-                ALenum format;
-        };
+    private:
+      std::string path;
+
+      FILE*           oggFile;
+      OggVorbis_File  oggStream;
+      vorbis_info*    vorbisInfo;
+      vorbis_comment* vorbisComment;
+      bool loaded;
+
+      ALuint buffers[2];
+      ALuint source;
+      ALenum format;
+  };
 }