|
| From: | Andrea Palmatè |
| Subject: | [Gnash-commit] /srv/bzr/gnash/trunk r12323: Fixing some OS4 functions |
| Date: | Thu, 22 Jul 2010 00:23:15 +0200 |
| User-agent: | Bazaar (2.0.3) |
------------------------------------------------------------ revno: 12323 committer: Andrea Palmatè <address@hidden> branch nick: gnash timestamp: Thu 2010-07-22 00:23:15 +0200 message: Fixing some OS4 functions modified: gui/aos4/aos4.cpp gui/aos4/aos4_agg_glue.cpp gui/aos4/aos4sup.h libsound/aos4/sound_handler_ahi.cpp
=== modified file 'gui/aos4/aos4.cpp'
--- a/gui/aos4/aos4.cpp 2010-07-15 03:07:54 +0000
+++ b/gui/aos4/aos4.cpp 2010-07-21 22:23:15 +0000
@@ -57,6 +57,7 @@
extern int audioTaskID;
#define GAD(x) (struct Gadget *)Objects[x]
+#define OBJ(x) Objects[x]
#define RESET_TIME 30 * 1000
@@ -340,85 +341,85 @@
done=TRUE;
break;
case OBJ_OK:
-
IIntuition->GetAttr(SCROLLER_Top, (Object *)GAD(OBJ_SCROLLER), &iValue);
+
IIntuition->GetAttr(SCROLLER_Top, OBJ(OBJ_SCROLLER), &iValue);
_rcfile.verbosityLevel(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object *)GAD(OBJ_LOGTOFILE),
&iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGTOFILE), &iValue);
_rcfile.useWriteLog(iValue);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object
*)GAD(OBJ_LOGFILENAME_VALUE), &sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_LOGFILENAME_VALUE),
&sValue);
tmp.assign((const char *)sValue);
_rcfile.setDebugLog(tmp);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object *)GAD(OBJ_LOGPARSER),
&iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGPARSER), &iValue);
_rcfile.useParserDump(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object *)GAD(OBJ_LOGSWF),
&iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGSWF), &iValue);
_rcfile.useActionDump(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_LOGMALFORMEDSWF), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGMALFORMEDSWF),
&iValue);
_rcfile.showMalformedSWFErrors(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_LOGACTIONSCRIPT), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGACTIONSCRIPT),
&iValue);
_rcfile.showASCodingErrors(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_LOGLOCALCONNECTION), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_LOGLOCALCONNECTION),
&iValue);
_rcfile.setLCTrace(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_CONNECTLOCALHOST), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_CONNECTLOCALHOST),
&iValue);
_rcfile.useLocalHost(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_CONNECTLOCALDOMAIN), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_CONNECTLOCALDOMAIN),
&iValue);
_rcfile.useLocalDomain(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object *)GAD(OBJ_DISABLESSL),
&iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_DISABLESSL), &iValue);
_rcfile.insecureSSL(iValue);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object
*)GAD(OBJ_SHAREDOBJDIR_VALUE), &sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_SHAREDOBJDIR_VALUE),
&sValue);
tmp.assign((const char *)sValue);
_rcfile.setSOLSafeDir(tmp);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_DONTWRITESHAREDOBJ), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_DONTWRITESHAREDOBJ),
&iValue);
_rcfile.setSOLReadOnly(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_ONLYLOCALSHAREDOBJ), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_ONLYLOCALSHAREDOBJ),
&iValue);
_rcfile.setSOLLocalDomain(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_DISABLELOCALCONNOBJ), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_DISABLELOCALCONNOBJ),
&iValue);
_rcfile.setLocalConnection(iValue);
-
IIntuition->GetAttr(INTEGER_Number, (Object *)GAD(OBJ_NETWORKTIMEOUT),
&iValue);
+
IIntuition->GetAttr(INTEGER_Number, OBJ(OBJ_NETWORKTIMEOUT), &iValue);
_rcfile.setStreamsTimeout(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_USESOUNDHANDLER), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_USESOUNDHANDLER),
&iValue);
_rcfile.useSound(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_SAVEMEDIASTREAMS), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_SAVEMEDIASTREAMS),
&iValue);
_rcfile.saveStreamingMedia(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object
*)GAD(OBJ_SEVEDYNAMICSTREAMS), &iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_SEVEDYNAMICSTREAMS),
&iValue);
_rcfile.saveLoadedMedia(iValue);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object
*)GAD(OBJ_MEDIASAVEDIR_VALUE), &sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_MEDIASAVEDIR_VALUE),
&sValue);
tmp.assign((const char *)sValue);
_rcfile.setMediaDir(tmp);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object
*)GAD(OBJ_PLAYERVERSION_VALUE), &sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_PLAYERVERSION_VALUE),
&sValue);
tmp.assign((const char *)sValue);
_rcfile.setFlashVersionString(tmp);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object *)GAD(OBJ_OS_VALUE),
&sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_OS_VALUE), &sValue);
tmp.assign((const char *)sValue);
_rcfile.setFlashSystemOS(tmp);
-
IIntuition->GetAttr(STRINGA_TextVal, (Object
*)GAD(OBJ_URLOPENER_VALUE), &sValue);
+
IIntuition->GetAttr(STRINGA_TextVal, OBJ(OBJ_URLOPENER_VALUE), &sValue);
tmp.assign((const char *)sValue);
_rcfile.setURLOpenerFormat(tmp);
-
IIntuition->GetAttr(INTEGER_Number, (Object *)GAD(OBJ_SIZEMOVIELIB),
&iValue);
+
IIntuition->GetAttr(INTEGER_Number, OBJ(OBJ_SIZEMOVIELIB), &iValue);
_rcfile.setMovieLibraryLimit(iValue);
-
IIntuition->GetAttr(CHECKBOX_Checked, (Object *)GAD(OBJ_STARTINPAUSE),
&iValue);
+
IIntuition->GetAttr(CHECKBOX_Checked, OBJ(OBJ_STARTINPAUSE), &iValue);
_rcfile.startStopped(iValue);
_rcfile.updateFile();
@@ -829,15 +830,17 @@
}
}
-double
+uint32
AOS4Gui::OS4_GetTicks()
{
struct TimeVal cur;
-
+ uint32 result = 0;
+
ITimer->GetSysTime(&cur);
ITimer->SubTime(&cur, &os4timer_starttime);
+ result = cur.Seconds * 1000 + cur.Microseconds / 1000;
- return cur.Seconds * 1000 + cur.Microseconds / 1000;
+ return result;
}
void
@@ -877,7 +880,7 @@
#endif
"\n\nCopyright (C) 2005, 2006,
2007, "
"2008, 2009, 2010 The Free Software Foundation"
- "\n\nAmigaOS4 Version by Andrea
Palmatè - http://www.amigasoft.net";;
+ "\n\nAmigaOS4 Version by Andrea
Palmate' - http://www.amigasoft.net";;
PrintMsg(about);
}
=== modified file 'gui/aos4/aos4_agg_glue.cpp'
--- a/gui/aos4/aos4_agg_glue.cpp 2010-07-15 03:07:54 +0000
+++ b/gui/aos4/aos4_agg_glue.cpp 2010-07-21 22:23:15 +0000
@@ -19,7 +19,6 @@
//
#include "aos4_agg_glue.h"
-#include "gnash.h"
#include "log.h"
#undef ACTION_END
#include "Renderer.h"
@@ -235,6 +234,7 @@
WA_MaxWidth, ~0,
WA_MaxHeight, ~0,
WA_SmartRefresh, TRUE,
+ WA_NoCareRefresh, TRUE,
WA_RMBTrap, FALSE,
WA_ReportMouse, TRUE,
WA_IDCMP, IDCMP_MOUSEBUTTONS|
@@ -369,7 +369,6 @@
maxx - minx ,
maxy - miny);
-
/*
IGraphics->BltBitMapTags(
BLITA_Source,
_offscreenbuf,
=== modified file 'gui/aos4/aos4sup.h'
--- a/gui/aos4/aos4sup.h 2010-07-15 03:07:54 +0000
+++ b/gui/aos4/aos4sup.h 2010-07-21 22:23:15 +0000
@@ -104,7 +104,7 @@
static key::code os4_to_gnash_key(struct IntuiMessage *imsg);
static int os4_to_gnash_modifier(int state);
- double OS4_GetTicks();
+ uint32 OS4_GetTicks();
void PrintMsg( CONST_STRPTR text );
void TimerExit(void);
bool TimerInit(void);
=== modified file 'libsound/aos4/sound_handler_ahi.cpp'
--- a/libsound/aos4/sound_handler_ahi.cpp 2010-07-18 17:10:05 +0000
+++ b/libsound/aos4/sound_handler_ahi.cpp 2010-07-21 22:23:15 +0000
@@ -497,7 +497,7 @@
boost::uint8_t *out = reinterpret_cast<boost::uint8_t*>(outSamples);
boost::uint8_t* in = reinterpret_cast<boost::uint8_t*>(inSamples);
- MixAudio(out, in, nBytes, MIX_MAXVOLUME*volume);
+ MixAudio(out, in, nBytes, static_cast<int>(MIX_MAXVOLUME*volume));
}
}
| [Prev in Thread] | Current Thread | [Next in Thread] |