miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f37cc6cda01fb153aea8dfe5b5ea1518dad2bc16
commandergenius/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff

249 lines
8.1 KiB
Diff
Raw Blame History

Only in milkytracker-0.90.85: config.h
Only in milkytracker-0.90.85: config.log
Only in milkytracker-0.90.85: config.status
diff -u -r milkytracker-0.90.85-old/configure milkytracker-0.90.85/configure
--- milkytracker-0.90.85-old/configure 2010-01-02 02:03:37.000000000 +0200
+++ milkytracker-0.90.85/configure 2012-06-19 14:47:54.608553718 +0300
@@ -5431,95 +5431,9 @@
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5
-$as_echo_n "checking for ZZIP... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$ZZIP_CFLAGS"; then
- pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
- ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ZZIP_LIBS"; then
- pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
- ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
- else
- ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$ZZIP_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (zziplib >= 0.10.75) were not met:
$ZZIP_PKG_ERRORS
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables ZZIP_CFLAGS
-and ZZIP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables ZZIP_CFLAGS
-and ZZIP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
-else
- ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS
- ZZIP_LIBS=$pkg_cv_ZZIP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-fi
-
SDL_VERSION=1.2.0
# Check whether --with-sdl-prefix was given.
Only in milkytracker-0.90.85: Makefile
Only in milkytracker-0.90.85/src/compression: .deps
Only in milkytracker-0.90.85/src/compression: Makefile
Only in milkytracker-0.90.85/src/compression/zziplib/generic: .deps
Only in milkytracker-0.90.85/src/compression/zziplib/generic: Makefile
Only in milkytracker-0.90.85/src/fx: .deps
Only in milkytracker-0.90.85/src/fx: Makefile
Only in milkytracker-0.90.85/src: Makefile
Only in milkytracker-0.90.85/src/midi: .deps
Only in milkytracker-0.90.85/src/midi: Makefile
Only in milkytracker-0.90.85/src/milkyplay: .deps
Only in milkytracker-0.90.85/src/milkyplay: Makefile
Only in milkytracker-0.90.85/src/ppui: .deps
Only in milkytracker-0.90.85/src/ppui: Makefile
Only in milkytracker-0.90.85/src/ppui/osinterface: .deps
Only in milkytracker-0.90.85/src/ppui/osinterface: Makefile
diff -u -r milkytracker-0.90.85-old/src/ppui/sdl/DisplayDevice_SDL.cpp milkytracker-0.90.85/src/ppui/sdl/DisplayDevice_SDL.cpp
--- milkytracker-0.90.85-old/src/ppui/sdl/DisplayDevice_SDL.cpp 2009-02-22 12:20:39.000000000 +0200
+++ milkytracker-0.90.85/src/ppui/sdl/DisplayDevice_SDL.cpp 2012-06-19 14:52:22.140551268 +0300
@@ -47,6 +47,7 @@
return NULL;
}
}
+ SDL_Flip(screen); // Update screen on Android
return screen;
}
@@ -173,6 +174,8 @@
void PPDisplayDevice::setSize(const PPSize& size)
{
theSurface = SDL_SetVideoMode(size.width, size.height, theSurface->format->BitsPerPixel, theSurface->flags);
+ if(theSurface)
+ SDL_Flip(theSurface); // Update screen on Android
}
bool PPDisplayDevice::goFullScreen(bool b)
Only in milkytracker-0.90.85/src/tracker: .deps
Only in milkytracker-0.90.85/src/tracker: Makefile
diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp
--- milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp 2009-02-22 12:20:39.000000000 +0200
+++ milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp 2012-06-19 14:47:54.608553718 +0300
@@ -303,7 +303,7 @@
#endif
if (lMouseDown &&
- (timerTicker - lButtonDownStartTime) > 25)
+ (timerTicker - lButtonDownStartTime) > 100)
{
ev.code = SDLUserEventLMouseRepeat;
ev.data1 = (void*)p.x;
@@ -315,7 +315,7 @@
}
if (rMouseDown &&
- (timerTicker - rButtonDownStartTime) > 25)
+ (timerTicker - rButtonDownStartTime) > 100)
{
ev.code = SDLUserEventRMouseRepeat;
ev.data1 = (void*)p.x;
@@ -424,7 +424,7 @@
{
pp_uint32 deltat = PPGetTickCount() - lmyTime;
- if (deltat > 500)
+ if (deltat > 2000)
{
lClickCount = 0;
lmyTime = PPGetTickCount();
@@ -455,7 +455,7 @@
{
pp_uint32 deltat = PPGetTickCount() - rmyTime;
- if (deltat > 500)
+ if (deltat > 2000)
{
rClickCount = 0;
rmyTime = PPGetTickCount();
@@ -504,11 +504,11 @@
{
pp_uint32 deltat = PPGetTickCount() - lmyTime;
- if (deltat < 500)
+ if (deltat < 2000)
{
p.x = localMouseX; p.y = localMouseY;
- if (abs(p.x - llastClickPosition.x) < 4 &&
- abs(p.y - llastClickPosition.y) < 4)
+ if (abs(p.x - llastClickPosition.x) < 30 &&
+ abs(p.y - llastClickPosition.y) < 30)
{
PPEvent myEvent(eLMouseDoubleClick, &p, sizeof(PPPoint));
RaiseEventSerialized(&myEvent);
@@ -531,11 +531,11 @@
{
pp_uint32 deltat = PPGetTickCount() - rmyTime;
- if (deltat < 500)
+ if (deltat < 2000)
{
p.x = localMouseX; p.y = localMouseY;
- if (abs(p.x - rlastClickPosition.x) < 4 &&
- abs(p.y - rlastClickPosition.y) < 4)
+ if (abs(p.x - rlastClickPosition.x) < 30 &&
+ abs(p.y - rlastClickPosition.y) < 30)
{
PPEvent myEvent(eRMouseDoubleClick, &p, sizeof(PPPoint));
RaiseEventSerialized(&myEvent);
@@ -570,13 +570,33 @@
p.x = localMouseX; p.y = localMouseY;
if (mouseButton == 1 && lMouseDown)
{
- PPEvent myEvent(eLMouseDrag, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
+ if (abs(p.x - llastClickPosition.x) < 30 &&
+ abs(p.y - llastClickPosition.y) < 30)
+ {
+ PPEvent myEvent(eMouseMoved, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ }
+ else
+ {
+ llastClickPosition.x = -31;
+ PPEvent myEvent(eLMouseDrag, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ }
}
else if (rMouseDown)
{
- PPEvent myEvent(eRMouseDrag, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
+ if (abs(p.x - rlastClickPosition.x) < 30 &&
+ abs(p.y - rlastClickPosition.y) < 30)
+ {
+ PPEvent myEvent(eMouseMoved, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ }
+ else
+ {
+ rlastClickPosition.x = -31;
+ PPEvent myEvent(eRMouseDrag, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ }
}
}
}
Only in milkytracker-0.90.85: stamp-h1
Reference in New Issue View Git Blame Copy Permalink