[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h |
Date: |
Mon, 05 May 2008 07:42:27 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/05 07:42:27
Modified files:
. : ChangeLog
gui : Player.cpp Player.h
Log message:
* gui/Player.{cpp,h}: fix initialization warning, use camelCase
for
new methods and members (and some old ones). Minor doc
additions.
Would be nice if the audio-dump-related code could be moved
out
of Player.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6492&r2=1.6493
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&r1=1.30&r2=1.31
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6492
retrieving revision 1.6493
diff -u -b -r1.6492 -r1.6493
--- ChangeLog 5 May 2008 07:39:03 -0000 1.6492
+++ ChangeLog 5 May 2008 07:42:27 -0000 1.6493
@@ -1,3 +1,10 @@
+2008-05-05 Benjamin Wolsey <address@hidden>
+
+ * gui/Player.{cpp,h}: fix initialization warning, use camelCase for
+ new methods and members (and some old ones). Minor doc additions.
+ Would be nice if the audio-dump-related code could be moved out
+ of Player.
+
2008-05-05 Sandro Santilli <address@hidden>
* doc/C/NOTES: add notes about classes in the 'flash'
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- gui/Player.cpp 2 May 2008 20:23:31 -0000 1.105
+++ gui/Player.cpp 5 May 2008 07:42:27 -0000 1.106
@@ -48,8 +48,6 @@
#include <sstream>
#include <iomanip>
-using std::endl;
-using std::cerr;
using namespace gnash;
namespace {
@@ -92,8 +90,8 @@
_fpsDebugTime(0.0),
#endif
_hostfd(-1),
- _audio_dump(NULL),
- _startFullscreen(false)
+ _startFullscreen(false),
+ _audioDump(NULL)
{
init();
}
@@ -161,7 +159,7 @@
}
bool
-Player::silent_stream(void* /*udata*/, boost::uint8_t* stream, int len)
+Player::silentStream(void* /*udata*/, boost::uint8_t* stream, int len)
{
memset((void*)stream, 0, len);
return true;
@@ -172,21 +170,21 @@
{
if (_doSound) {
#ifdef SOUND_SDL
- _sound_handler.reset(
gnash::media::create_sound_handler_sdl(_audio_dump) );
- if (_audio_dump != NULL) {
+ _soundHandler.reset(
gnash::media::create_sound_handler_sdl(_audio_dump) );
+ if (_audioDump != NULL) {
// add a silent stream to the audio pool so that our output file
// is homogenous; we actually want silent wave data when no sounds
// are playing on the stage
- _sound_handler->attach_aux_streamer(silent_stream, (void*) this);
+ _soundHandler->attach_aux_streamer(silentStream, (void*) this);
}
#elif defined(SOUND_GST)
- _sound_handler.reset( gnash::media::create_sound_handler_gst() );
+ _soundHandler.reset( gnash::media::create_sound_handler_gst() );
#else
log_error(_("Sound requested but no sound support compiled in"));
return;
#endif
- gnash::set_sound_handler(_sound_handler.get());
+ gnash::set_sound_handler(_soundHandler.get());
}
}
@@ -429,7 +427,7 @@
{
//log_debug("user-provided host requests fd is %d", hostfd);
std::stringstream request;
- request << "INVOKE " << command << ":" << args << endl;
+ request << "INVOKE " << command << ":" << args << std::endl;
std::string requestString = request.str();
const char* cmd = requestString.c_str();
Index: gui/Player.h
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gui/Player.h 2 May 2008 20:23:31 -0000 1.30
+++ gui/Player.h 5 May 2008 07:42:27 -0000 1.31
@@ -23,13 +23,12 @@
#include "gnashconfig.h"
#endif
-#include "gnash.h" // still needed ?
+#include "gnash.h" // needed for interface and fscommand callbacks
#include "sound_handler.h" // for visibility of sound_handler destructor
#include "gui.h"
#include <string>
#include <map>
-#include <iostream> // debugging...
// Forward declarations
namespace gnash
@@ -135,7 +134,7 @@
}
void setAudioDumpfile(const char* filespec) {
- _audio_dump = filespec;
+ _audioDump = filespec;
}
private:
@@ -151,7 +150,7 @@
/// @param len
/// Requested amount of data to put
/// @return success
- static bool silent_stream(void* udata, boost::uint8_t* stream, int len);
+ static bool silentStream(void* udata, boost::uint8_t* stream, int len);
void init_sound();
@@ -201,7 +200,7 @@
static std::auto_ptr<Gui> _gui;
- std::auto_ptr<media::sound_handler> _sound_handler;
+ std::auto_ptr<media::sound_handler> _soundHandler;
std::string _url;
@@ -211,7 +210,7 @@
unsigned long _maxAdvances;
- /// Load the "_infile" movie setting it's url to "_url"
+ /// Load the "_infile" movie setting its url to "_url"
//
/// This function takes care of interpreting _infile as
/// stdin when it equals "-". May throw a GnashException
@@ -230,7 +229,8 @@
// (Or what did you think it meant?)
bool _startFullscreen;
- const char* _audio_dump;
+ // The filename to use for dumping audio.
+ const char* _audioDump;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h,
Benjamin Wolsey <=