diff --git a/samples/BrowserPlugin/jni/PluginObject.h b/samples/BrowserPlugin/jni/PluginObject.h index 0ebed28bd..296749ae7 100644 --- a/samples/BrowserPlugin/jni/PluginObject.h +++ b/samples/BrowserPlugin/jni/PluginObject.h @@ -48,7 +48,7 @@ class SubPlugin { public: SubPlugin(NPP inst) : m_inst(inst) {} virtual ~SubPlugin() {} - virtual int16 handleEvent(const ANPEvent* evt) = 0; + virtual int16_t handleEvent(const ANPEvent* evt) = 0; virtual bool supportsDrawingModel(ANPDrawingModel) = 0; int getPluginWidth(); diff --git a/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp b/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp index 72a11c978..6e93fb674 100644 --- a/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp +++ b/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp @@ -35,12 +35,12 @@ extern ANPPaintInterfaceV0 gPaintI; extern ANPPathInterfaceV0 gPathI; extern ANPWindowInterfaceV0 gWindowI; -static uint16 rnd16(float x, int inset) { +static uint16_t rnd16(float x, int inset) { int ix = (int)roundf(x) + inset; if (ix < 0) { ix = 0; } - return static_cast(ix); + return static_cast(ix); } static void inval(NPP instance, const ANPRectF& r, bool doAA) { @@ -173,7 +173,7 @@ void BallAnimation::showEntirePluginOnScreen() { gWindowI.clearVisibleRects(instance); } -int16 BallAnimation::handleEvent(const ANPEvent* evt) { +int16_t BallAnimation::handleEvent(const ANPEvent* evt) { NPP instance = this->inst(); switch (evt->eventType) { diff --git a/samples/BrowserPlugin/jni/animation/AnimationPlugin.h b/samples/BrowserPlugin/jni/animation/AnimationPlugin.h index ef2a3f540..4a5b4e87a 100644 --- a/samples/BrowserPlugin/jni/animation/AnimationPlugin.h +++ b/samples/BrowserPlugin/jni/animation/AnimationPlugin.h @@ -33,7 +33,7 @@ public: BallAnimation(NPP inst); virtual ~BallAnimation(); virtual bool supportsDrawingModel(ANPDrawingModel); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); private: void drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip); void showEntirePluginOnScreen(); diff --git a/samples/BrowserPlugin/jni/audio/AudioPlugin.cpp b/samples/BrowserPlugin/jni/audio/AudioPlugin.cpp index 9731f19b9..8defef4d0 100644 --- a/samples/BrowserPlugin/jni/audio/AudioPlugin.cpp +++ b/samples/BrowserPlugin/jni/audio/AudioPlugin.cpp @@ -44,12 +44,12 @@ static void inval(NPP instance) { browser->invalidaterect(instance, NULL); } -static uint16 rnd16(float x, int inset) { +static uint16_t rnd16(float x, int inset) { int ix = (int)roundf(x) + inset; if (ix < 0) { ix = 0; } - return static_cast(ix); + return static_cast(ix); } static void inval(NPP instance, const ANPRectF& r, bool doAA) { @@ -272,7 +272,7 @@ ANPPaint* AudioPlugin::getPaint(ANPRectF* input) { return (input == m_activeRect) ? m_paintActiveRect : m_paintRect; } -int16 AudioPlugin::handleEvent(const ANPEvent* evt) { +int16_t AudioPlugin::handleEvent(const ANPEvent* evt) { NPP instance = this->inst(); switch (evt->eventType) { diff --git a/samples/BrowserPlugin/jni/audio/AudioPlugin.h b/samples/BrowserPlugin/jni/audio/AudioPlugin.h index 129d33a78..0f88a9206 100644 --- a/samples/BrowserPlugin/jni/audio/AudioPlugin.h +++ b/samples/BrowserPlugin/jni/audio/AudioPlugin.h @@ -42,7 +42,7 @@ public: AudioPlugin(NPP inst); virtual ~AudioPlugin(); virtual bool supportsDrawingModel(ANPDrawingModel); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); private: void draw(ANPCanvas*); void drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip); diff --git a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp index f74963933..515acbe58 100644 --- a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp +++ b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp @@ -179,7 +179,7 @@ void BackgroundPlugin::drawPlugin(int surfaceWidth, int surfaceHeight) { gSurfaceI.unlock(env, m_surface); } -int16 BackgroundPlugin::handleEvent(const ANPEvent* evt) { +int16_t BackgroundPlugin::handleEvent(const ANPEvent* evt) { switch (evt->eventType) { case kDraw_ANPEventType: gLogI.log(kError_ANPLogType, " ------ %p the plugin did not request draw events", inst()); @@ -233,10 +233,10 @@ void BackgroundPlugin::test_logging() { /////////////////////////////////////////////////////////////////////////////// #define TIMER_INTERVAL 50 -static void timer_oneshot(NPP instance, uint32 timerID); -static void timer_repeat(NPP instance, uint32 timerID); -static void timer_neverfires(NPP instance, uint32 timerID); -static void timer_latency(NPP instance, uint32 timerID); +static void timer_oneshot(NPP instance, uint32_t timerID); +static void timer_repeat(NPP instance, uint32_t timerID); +static void timer_neverfires(NPP instance, uint32_t timerID); +static void timer_latency(NPP instance, uint32_t timerID); void BackgroundPlugin::test_timers() { NPP instance = this->inst(); @@ -255,18 +255,18 @@ void BackgroundPlugin::test_timers() { browser->scheduletimer(instance, TIMER_INTERVAL, true, timer_latency); mStartTime = mPrevTime = getMSecs(); // test unschedule immediately - uint32 id = browser->scheduletimer(instance, 100, false, timer_neverfires); + uint32_t id = browser->scheduletimer(instance, 100, false, timer_neverfires); browser->unscheduletimer(instance, id); // test double unschedule (should be no-op) browser->unscheduletimer(instance, id); } -static void timer_oneshot(NPP instance, uint32 timerID) { +static void timer_oneshot(NPP instance, uint32_t timerID) { gLogI.log(kDebug_ANPLogType, "-------- oneshot timer\n"); } -static void timer_repeat(NPP instance, uint32 timerID) { +static void timer_repeat(NPP instance, uint32_t timerID) { BackgroundPlugin *obj = ((BackgroundPlugin*) ((PluginObject*) instance->pdata)->activePlugin); gLogI.log(kDebug_ANPLogType, "-------- repeat timer %d\n", @@ -276,11 +276,11 @@ static void timer_repeat(NPP instance, uint32 timerID) { } } -static void timer_neverfires(NPP instance, uint32 timerID) { +static void timer_neverfires(NPP instance, uint32_t timerID) { gLogI.log(kError_ANPLogType, "-------- timer_neverfires!!!\n"); } -static void timer_latency(NPP instance, uint32 timerID) { +static void timer_latency(NPP instance, uint32_t timerID) { BackgroundPlugin *obj = ((BackgroundPlugin*) ((PluginObject*) instance->pdata)->activePlugin); obj->mTimerLatencyCurrentCount += 1; diff --git a/samples/BrowserPlugin/jni/background/BackgroundPlugin.h b/samples/BrowserPlugin/jni/background/BackgroundPlugin.h index ebd77d16d..e0b0597db 100644 --- a/samples/BrowserPlugin/jni/background/BackgroundPlugin.h +++ b/samples/BrowserPlugin/jni/background/BackgroundPlugin.h @@ -32,7 +32,7 @@ class BackgroundPlugin : public SurfaceSubPlugin { public: BackgroundPlugin(NPP inst); virtual ~BackgroundPlugin(); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); virtual jobject getSurface(); // Timer Testing Variables diff --git a/samples/BrowserPlugin/jni/form/FormPlugin.cpp b/samples/BrowserPlugin/jni/form/FormPlugin.cpp index 5a536d9af..110afaaa4 100644 --- a/samples/BrowserPlugin/jni/form/FormPlugin.cpp +++ b/samples/BrowserPlugin/jni/form/FormPlugin.cpp @@ -43,12 +43,12 @@ static void inval(NPP instance) { browser->invalidaterect(instance, NULL); } -static uint16 rnd16(float x, int inset) { +static uint16_t rnd16(float x, int inset) { int ix = (int)roundf(x) + inset; if (ix < 0) { ix = 0; } - return static_cast(ix); + return static_cast(ix); } static void inval(NPP instance, const ANPRectF& r, bool doAA) { @@ -199,7 +199,7 @@ void FormPlugin::drawPassword(ANPCanvas* canvas, TextInput passwordInput) { } } -int16 FormPlugin::handleEvent(const ANPEvent* evt) { +int16_t FormPlugin::handleEvent(const ANPEvent* evt) { NPP instance = this->inst(); switch (evt->eventType) { diff --git a/samples/BrowserPlugin/jni/form/FormPlugin.h b/samples/BrowserPlugin/jni/form/FormPlugin.h index 041ffb870..9f985a3c6 100644 --- a/samples/BrowserPlugin/jni/form/FormPlugin.h +++ b/samples/BrowserPlugin/jni/form/FormPlugin.h @@ -39,7 +39,7 @@ public: FormPlugin(NPP inst); virtual ~FormPlugin(); virtual bool supportsDrawingModel(ANPDrawingModel); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); private: void draw(ANPCanvas*); void drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip); diff --git a/samples/BrowserPlugin/jni/main.cpp b/samples/BrowserPlugin/jni/main.cpp index 3e8fee7a8..07bae66ff 100644 --- a/samples/BrowserPlugin/jni/main.cpp +++ b/samples/BrowserPlugin/jni/main.cpp @@ -41,19 +41,19 @@ JavaVM* gVM; #define EXPORT __attribute__((visibility("default"))) -NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, +NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved); NPError NPP_Destroy(NPP instance, NPSavedData** save); NPError NPP_SetWindow(NPP instance, NPWindow* window); NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, - NPBool seekable, uint16* stype); + NPBool seekable, uint16_t* stype); NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason); -int32 NPP_WriteReady(NPP instance, NPStream* stream); -int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, +int32_t NPP_WriteReady(NPP instance, NPStream* stream); +int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer); void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname); void NPP_Print(NPP instance, NPPrint* platformPrint); -int16 NPP_HandleEvent(NPP instance, void* event); +int16_t NPP_HandleEvent(NPP instance, void* event); void NPP_URLNotify(NPP instance, const char* URL, NPReason reason, void* notifyData); NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value); @@ -151,7 +151,7 @@ const char *NP_GetMIMEDescription(void) return "application/x-testbrowserplugin:tst:Test plugin mimetype is application/x-testbrowserplugin"; } -NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, +NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved) { @@ -290,7 +290,7 @@ NPError NPP_SetWindow(NPP instance, NPWindow* window) return NPERR_NO_ERROR; } -NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype) +NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype) { *stype = NP_ASFILEONLY; return NPERR_NO_ERROR; @@ -301,12 +301,12 @@ NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) return NPERR_NO_ERROR; } -int32 NPP_WriteReady(NPP instance, NPStream* stream) +int32_t NPP_WriteReady(NPP instance, NPStream* stream) { return 0; } -int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer) +int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer) { return 0; } @@ -319,7 +319,7 @@ void NPP_Print(NPP instance, NPPrint* platformPrint) { } -int16 NPP_HandleEvent(NPP instance, void* event) +int16_t NPP_HandleEvent(NPP instance, void* event) { PluginObject *obj = reinterpret_cast(instance->pdata); const ANPEvent* evt = reinterpret_cast(event); diff --git a/samples/BrowserPlugin/jni/navigation/NavigationPlugin.cpp b/samples/BrowserPlugin/jni/navigation/NavigationPlugin.cpp index 99667a474..01d9a7914 100644 --- a/samples/BrowserPlugin/jni/navigation/NavigationPlugin.cpp +++ b/samples/BrowserPlugin/jni/navigation/NavigationPlugin.cpp @@ -43,12 +43,12 @@ static void inval(NPP instance) { browser->invalidaterect(instance, NULL); } -static uint16 rnd16(float x, int inset) { +static uint16_t rnd16(float x, int inset) { int ix = (int)roundf(x) + inset; if (ix < 0) { ix = 0; } - return static_cast(ix); + return static_cast(ix); } static void inval(NPP instance, const ANPRectF& r, bool doAA) { @@ -163,7 +163,7 @@ ANPPaint* NavigationPlugin::getPaint(ANPRectF* input) { return (input == m_activeNav) ? m_paintActive : m_paintDisabled; } -int16 NavigationPlugin::handleEvent(const ANPEvent* evt) { +int16_t NavigationPlugin::handleEvent(const ANPEvent* evt) { NPP instance = this->inst(); switch (evt->eventType) { diff --git a/samples/BrowserPlugin/jni/navigation/NavigationPlugin.h b/samples/BrowserPlugin/jni/navigation/NavigationPlugin.h index ca12ae77f..c2044bbc6 100644 --- a/samples/BrowserPlugin/jni/navigation/NavigationPlugin.h +++ b/samples/BrowserPlugin/jni/navigation/NavigationPlugin.h @@ -33,7 +33,7 @@ public: NavigationPlugin(NPP inst); virtual ~NavigationPlugin(); virtual bool supportsDrawingModel(ANPDrawingModel); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); private: void draw(ANPCanvas*); void drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip); diff --git a/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp b/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp index 71b9f24d4..abe6805ce 100644 --- a/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp +++ b/samples/BrowserPlugin/jni/paint/PaintPlugin.cpp @@ -273,7 +273,7 @@ void PaintPlugin::destroySurface() { } } -int16 PaintPlugin::handleEvent(const ANPEvent* evt) { +int16_t PaintPlugin::handleEvent(const ANPEvent* evt) { switch (evt->eventType) { case kTouch_ANPEventType: { float x = (float) evt->data.touch.x; diff --git a/samples/BrowserPlugin/jni/paint/PaintPlugin.h b/samples/BrowserPlugin/jni/paint/PaintPlugin.h index 035e51b3a..ffdf6248c 100644 --- a/samples/BrowserPlugin/jni/paint/PaintPlugin.h +++ b/samples/BrowserPlugin/jni/paint/PaintPlugin.h @@ -33,7 +33,7 @@ class PaintPlugin : public SurfaceSubPlugin { public: PaintPlugin(NPP inst); virtual ~PaintPlugin(); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); virtual jobject getSurface(); private: diff --git a/samples/BrowserPlugin/jni/video/VideoPlugin.cpp b/samples/BrowserPlugin/jni/video/VideoPlugin.cpp index f24295ba7..bf3ab7666 100644 --- a/samples/BrowserPlugin/jni/video/VideoPlugin.cpp +++ b/samples/BrowserPlugin/jni/video/VideoPlugin.cpp @@ -103,7 +103,7 @@ void VideoPlugin::destroySurface() { } } -int16 VideoPlugin::handleEvent(const ANPEvent* evt) { +int16_t VideoPlugin::handleEvent(const ANPEvent* evt) { switch (evt->eventType) { case kLifecycle_ANPEventType: { switch (evt->data.lifecycle.action) { diff --git a/samples/BrowserPlugin/jni/video/VideoPlugin.h b/samples/BrowserPlugin/jni/video/VideoPlugin.h index 701e2d0c8..fb1538690 100644 --- a/samples/BrowserPlugin/jni/video/VideoPlugin.h +++ b/samples/BrowserPlugin/jni/video/VideoPlugin.h @@ -32,7 +32,7 @@ class VideoPlugin : public SurfaceSubPlugin { public: VideoPlugin(NPP inst); virtual ~VideoPlugin(); - virtual int16 handleEvent(const ANPEvent* evt); + virtual int16_t handleEvent(const ANPEvent* evt); virtual jobject getSurface(); private: