[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/06 13:33:40

Modified files:
        .              : ChangeLog 
        libmedia/ffmpeg: sound_handler_sdl.cpp sound_handler_sdl.h 

Log message:
                * libmedia/ffmpeg/sound_handler_sdl.{h,cpp}: drop unnecessary
                  file_output member. Don't initialize ofstream with NULL in the
                  constructor (or indeed with anything).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6526&r2=1.6527
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6526
retrieving revision 1.6527
diff -u -b -r1.6526 -r1.6527
--- ChangeLog   6 May 2008 12:14:35 -0000       1.6526
+++ ChangeLog   6 May 2008 13:33:39 -0000       1.6527
@@ -1,5 +1,11 @@
 2008-05-06 Benjamin Wolsey <address@hidden>
 
+       * libmedia/ffmpeg/sound_handler_sdl.{h,cpp}: drop unnecessary
+         file_output member. Don't initialize ofstream with NULL in the
+         constructor (or indeed with anything).
+
+2008-05-06 Benjamin Wolsey <address@hidden>
+
        * gui/fb.cpp: internationalization.
        * server/sprite_instance.cpp, server/URLAccessManager.cpp: i18n
 

Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/ffmpeg/sound_handler_sdl.cpp       5 May 2008 18:58:05 -0000       
1.5
+++ libmedia/ffmpeg/sound_handler_sdl.cpp       6 May 2008 13:33:40 -0000       
1.6
@@ -47,11 +47,10 @@
 namespace gnash {
 namespace media {
 
-SDL_sound_handler::SDL_sound_handler(const std::string& wave_file)
+SDL_sound_handler::SDL_sound_handler(const std::string& wavefile)
        : soundOpened(false),
          soundsPlaying(0),
-         muted(false),
-         file_stream(NULL)
+         muted(false)
 {
        // This is our sound settings
        audioSpec.freq = 44100;
@@ -61,16 +60,15 @@
        audioSpec.userdata = this;
        audioSpec.samples = 2048;               //512 - not enough for  
videostream
 
-       if (!wave_file.empty()) {
-            file_output = wave_file;
-           file_stream.open(file_output.c_str());
+       if (! wavefile.empty() ) {
+        file_stream.open(wavefile.c_str());
            if (file_stream.fail()) {
-                std::cerr << "Unable to write file '" << file_output << "'\n";
+            std::cerr << "Unable to write file '" << wavefile << std::endl;
                 exit(1);
            } else {
                 write_wave_header(file_stream);
                 std::cout << "# Created 44100 16Mhz stereo wave file:" << 
std::endl <<
-                    "AUDIOFILE=" << file_output << std::endl;
+                    "AUDIOFILE=" << wavefile << std::endl;
            }
         }
 

Index: libmedia/ffmpeg/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/ffmpeg/sound_handler_sdl.h 5 May 2008 18:58:05 -0000       1.6
+++ libmedia/ffmpeg/sound_handler_sdl.h 6 May 2008 13:33:40 -0000       1.7
@@ -335,9 +335,6 @@
        // stop and delete all sounds
        void delete_all_sounds();
 
-       /// File name for dump file
-       std::string file_output;
-
         /// File stream for dump file
        std::ofstream file_stream;