| -rw-r--r-- | library/custom-ipaq.h | 5 | ||||
| -rw-r--r-- | library/custom-ramses.h | 3 | ||||
| -rw-r--r-- | library/custom-sharp.h | 4 | ||||
| -rw-r--r-- | library/custom-simpad.h | 4 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 10 | ||||
| -rw-r--r-- | library/storage.cpp | 2 |
6 files changed, 19 insertions, 9 deletions
diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h index a9319fa..8321199 100644 --- a/library/custom-ipaq.h +++ b/library/custom-ipaq.h @@ -17,5 +17,8 @@ ** not clear to you. ** **********************************************************************/ -#define QPE_NEED_CALIBRATION
\ No newline at end of file +#define QPE_NEED_CALIBRATION +#define OPIE_SOUND_FRAGMENT_SHIFT 14 +#define USE_REALTIME_AUDIO_THREAD +#define OPIE_NEW_MALLOC diff --git a/library/custom-ramses.h b/library/custom-ramses.h index 9104931..5a1abe4 100644 --- a/library/custom-ramses.h +++ b/library/custom-ramses.h @@ -20,8 +20,11 @@ #define QPE_NEED_CALIBRATION #define QPE_HAVE_TOGGLELIGHT #define QPE_STARTMENU +#define USE_REALTIME_AUDIO_THREAD +#define OPIE_NEW_MALLOC + #include <unistd.h> #include <stdio.h> #include <signal.h> diff --git a/library/custom-sharp.h b/library/custom-sharp.h index 3936875..b0e67b8 100644 --- a/library/custom-sharp.h +++ b/library/custom-sharp.h @@ -22,8 +22,12 @@ #define QPE_OWNAPM #define QPE_HAVE_TOGGLELIGHT #define QPE_NOCIBAUD #define QPE_STARTMENU +#define OPIE_NEW_MALLOC +#define USE_REALTIME_AUDIO_THREAD +#define OPIE_NO_SOUND_PCM_READ_BITS + #include <asm/sharp_apm.h> #ifndef APM_IOC_BATTERY_BACK_CHK #define APM_IOC_BATTERY_BACK_CHK _IO(APM_IOC_MAGIC, 32) #endif diff --git a/library/custom-simpad.h b/library/custom-simpad.h index 3872dfd..c951296 100644 --- a/library/custom-simpad.h +++ b/library/custom-simpad.h @@ -3,5 +3,7 @@ hOlgAr */ -#define QPE_NEED_CALIBRATION
\ No newline at end of file +#define QPE_NEED_CALIBRATION +#define OPIE_NEW_MALLOC +#define USE_REALTIME_AUDIO_THREAD diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index feba8b6..cd1c62e 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -166,9 +166,9 @@ public: // ugly hack, remove that later after finding a sane solution // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has // a (physically) large enough display to use the small icons -#ifndef QT_QWS_SIMPAD +#if defined(OPIE_HIGH_RES_SMALL_PHY) if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); } #endif @@ -589,12 +589,12 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) setFont( QFont( "vera", 8 ) ); AppLnk::setSmallIconSize( 10 ); AppLnk::setBigIconSize( 28 ); } -#ifndef QT_QWS_SIMPAD +#ifndef OPIE_HIGH_RES_SMALL_PHY else if ( dw > 600 ) { - setFont( QFont( "vera", 16 ) ); - AppLnk::setSmallIconSize( 24 ); + setFont( QFont( "vera", 16 ) ); + AppLnk::setSmallIconSize( 24 ); AppLnk::setBigIconSize( 48 ); } #endif else if ( dw > 200 ) { @@ -2007,9 +2007,9 @@ void __cxa_pure_virtual() #endif -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES) +#if defined(OPIE_NEW_MALLOC) // The libraries with the skiff package (and possibly others) have // completely useless implementations of builtin new and delete that // use about 50% of your CPU. Here we revert to the simple libc diff --git a/library/storage.cpp b/library/storage.cpp index 1ce43bc..dc5cc22 100644 --- a/library/storage.cpp +++ b/library/storage.cpp @@ -20,11 +20,9 @@ ** **********************************************************************/ #include <qpe/storage.h> -#if defined(QT_QWS_SL5XXX) #include <qpe/custom.h> -#endif #include <qfile.h> #include <qtimer.h> #include <qcopchannel_qws.h> |