[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12299: Fixing small compilation pro
From: |
Andrea Palmatè |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12299: Fixing small compilation problems. Fixed a broken os4 gui file that was cut.. |
Date: |
Mon, 12 Jul 2010 23:18:16 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12299
committer: Andrea Palmatè <address@hidden>
branch nick: gnash
timestamp: Mon 2010-07-12 23:18:16 +0200
message:
Fixing small compilation problems. Fixed a broken os4 gui file that was cut..
modified:
gui/aos4.cpp
gui/aos4_agg_glue.cpp
libcore/asobj/Date_as.cpp
libcore/fill_style.cpp
libcore/fill_style.h
libcore/swf/VideoFrameTag.cpp
libmedia/FLVParser.cpp
libsound/aos4/sound_handler_ahi.cpp
=== modified file 'gui/aos4.cpp'
--- a/gui/aos4.cpp 2010-07-10 08:30:45 +0000
+++ b/gui/aos4.cpp 2010-07-12 21:18:16 +0000
@@ -176,7 +176,7 @@
int button_state_old = -1;
struct IntuiMessage *imsg = NULL;
uint32 sigMask;
- uint32_t movie_time = OS4_GetTicks();
+ uint32 movie_time = OS4_GetTicks();
int mod = 0;
key::code code;
uint32 new_width = _width, new_height = _height;
@@ -877,4 +877,49 @@
#endif
"\n\nCopyright (C) 2005, 2006,
2007, "
"2008, 2009, 2010 The Free Software Foundation"
- "\n\nAmigaOS4 Version by Andrea
Palmat
+ "\n\nAmigaOS4 Version by Andrea
Palmatè - http://www.amigasoft.net";
+
+ PrintMsg(about);
+}
+
+struct GnashPrefs *
+AOS4Gui::ReadPrefs(void)
+{
+ RcInitFile& _rcfile = RcInitFile::getDefaultInstance();
+ struct GnashPrefs *localprefs;
+
+ localprefs = (struct GnashPrefs *) malloc(sizeof(GnashPrefs));
+ memset(localprefs, 0, sizeof(GnashPrefs));
+
+ localprefs->verbosity = _rcfile.verbosityLevel();
+ localprefs->logtofile = _rcfile.useWriteLog();
+ strncpy(localprefs->logfilename, _rcfile.getDebugLog().c_str(),
254);
+ localprefs->logparser = _rcfile.useParserDump();
+ localprefs->logswf = _rcfile.useActionDump();
+ localprefs->logmalformedswf = _rcfile.showMalformedSWFErrors();
+ localprefs->logactionscript = _rcfile.showASCodingErrors();
+#if 0
+ localprefs->loglocalconn = _rcfile.getLCTrace();
+#endif
+ localprefs->connectlocalhost = _rcfile.useLocalHost();
+ localprefs->connectlocaldomain = _rcfile.useLocalDomain();
+ localprefs->disablessl = _rcfile.insecureSSL();
+ strncpy(localprefs->sharedobjdir,
_rcfile.getSOLSafeDir().c_str(), 254);
+ localprefs->dontwriteso = _rcfile.getSOLReadOnly();
+ localprefs->onlylocalso = _rcfile.getSOLLocalDomain();
+ localprefs->disablelocal = _rcfile.getLocalConnection();
+ localprefs->nettimeout = _rcfile.getStreamsTimeout();
+ localprefs->usesound = _rcfile.useSound();
+ localprefs->savemedia = _rcfile.saveStreamingMedia();
+ localprefs->savedynamic = _rcfile.saveLoadedMedia();
+ strncpy(localprefs->savemediadir, _rcfile.getMediaDir().c_str(),
254);
+ strncpy(localprefs->playerversion,
_rcfile.getFlashVersionString().c_str(), 31);
+ strncpy(localprefs->detectedos,
_rcfile.getFlashSystemOS().c_str(), 31);
+ strncpy(localprefs->urlopener,
_rcfile.getURLOpenerFormat().c_str(), 254);
+ localprefs->maxsizemovielib =
_rcfile.getMovieLibraryLimit();
+ localprefs->startpaused = _rcfile.startStopped();
+ return localprefs;
+}
+
+} // namespace gnash
+
=== modified file 'gui/aos4_agg_glue.cpp'
--- a/gui/aos4_agg_glue.cpp 2010-01-11 06:41:38 +0000
+++ b/gui/aos4_agg_glue.cpp 2010-07-12 21:18:16 +0000
@@ -184,7 +184,7 @@
int depth_bytes = _bpp / 8; // TODO: <Udo> is this correct? Gives 1 for
15 bit modes!
struct Screen *_menu_screen; /* Screen pointer for the menu definition
*/
APTR vi;
- uint32_t left = 0, top = 0;
+ uint32 left = 0, top = 0;
assert(_bpp % 8 == 0);
=== modified file 'libcore/asobj/Date_as.cpp'
--- a/libcore/asobj/Date_as.cpp 2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/Date_as.cpp 2010-07-12 21:18:16 +0000
@@ -1366,7 +1366,7 @@
// Now work out the years from 1970 in days.
// Use a temporary 1970-based year for clarity.
- const int32_t ouryear = t.year - 70;
+ const boost::int32_t ouryear = t.year - 70;
// Count the leap years between 1970-1-1 and the beginning of our year.
// 1970 - 1972: no leap years
=== modified file 'libcore/fill_style.cpp'
--- a/libcore/fill_style.cpp 2010-03-13 18:00:33 +0000
+++ b/libcore/fill_style.cpp 2010-07-12 21:18:16 +0000
@@ -130,11 +130,11 @@
// GRADIENT
in.ensureBytes(1);
- uint8_t grad_props = in.read_u8();
+ boost::uint8_t grad_props = in.read_u8();
if (t == SWF::DEFINESHAPE4 ||
t == SWF::DEFINESHAPE4_) {
- uint8_t spread_mode = grad_props >> 6;
+ boost::uint8_t spread_mode = grad_props >> 6;
switch(spread_mode) {
case 0:
m_spread_mode = SWF::GRADIENT_SPREAD_PAD;
@@ -151,7 +151,7 @@
);
}
- uint8_t interpolation = (grad_props >> 4) & 3;
+ boost::uint8_t interpolation = (grad_props >> 4) & 3;
switch(interpolation) {
case 0:
m_interpolation = SWF::GRADIENT_INTERPOL_NORMAL;
@@ -167,7 +167,7 @@
}
}
- uint8_t num_gradients = grad_props & 0xF;
+ boost::uint8_t num_gradients = grad_props & 0xF;
if (!num_gradients) {
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("num gradients 0"));
=== modified file 'libcore/fill_style.h'
--- a/libcore/fill_style.h 2010-03-12 15:42:07 +0000
+++ b/libcore/fill_style.h 2010-07-12 21:18:16 +0000
@@ -181,7 +181,7 @@
}
/// Get fill type, see SWF::fill_style_type
- uint8_t get_type() const {
+ boost::uint8_t get_type() const {
return m_type;
}
@@ -254,7 +254,7 @@
SWF::gradient_interpolation_mode m_interpolation;
/// Fill type, see SWF::fill_style_type
- uint8_t m_type;
+ boost::uint8_t m_type;
// Only for BITMAP type
//
=== modified file 'libcore/swf/VideoFrameTag.cpp'
--- a/libcore/swf/VideoFrameTag.cpp 2010-03-11 01:47:08 +0000
+++ b/libcore/swf/VideoFrameTag.cpp 2010-07-12 21:18:16 +0000
@@ -71,7 +71,7 @@
const unsigned int dataLength = in.get_tag_end_position() - in.tell();
// FIXME: catch bad_alloc
- boost::uint8_t* buffer = new uint8_t[dataLength + padding];
+ boost::uint8_t* buffer = new boost::uint8_t[dataLength + padding];
const size_t bytesRead = in.read(reinterpret_cast<char*>(buffer),
dataLength);
=== modified file 'libmedia/FLVParser.cpp'
--- a/libmedia/FLVParser.cpp 2010-02-03 12:23:38 +0000
+++ b/libmedia/FLVParser.cpp 2010-07-12 21:18:16 +0000
@@ -306,7 +306,7 @@
_seekRequest = false;
}
- uint64_t& position = index_only ? _nextPosToIndex : _lastParsedPosition;
+ boost::uint64_t& position = index_only ? _nextPosToIndex :
_lastParsedPosition;
bool& completed = index_only ? _indexingCompleted : _parsingComplete;
//log_debug("parseNextTag: _lastParsedPosition:%d, _nextPosToIndex:%d,
index_only:%d", _lastParsedPosition, _nextPosToIndex, index_only);
=== modified file 'libsound/aos4/sound_handler_ahi.cpp'
--- a/libsound/aos4/sound_handler_ahi.cpp 2010-01-25 18:52:20 +0000
+++ b/libsound/aos4/sound_handler_ahi.cpp 2010-07-12 21:18:16 +0000
@@ -25,7 +25,6 @@
#include "SoundInfo.h"
#include "EmbedSound.h"
#include "AuxStream.h" // for use..
-#include "../../libcore/vm/VM.h"
#include "log.h" // will import boost::format too
#include "GnashException.h" // for SoundException
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12299: Fixing small compilation problems. Fixed a broken os4 gui file that was cut..,
Andrea Palmatè <=