summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 3b3a263..df03b22 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -27,12 +27,13 @@
#include <qmap.h>
#include "mediaplayerstate.h"
#include "playlistwidget.h"
#include <vector>
+#include <memory>
class MediaWidget : public QWidget
{
Q_OBJECT
public:
enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined };
@@ -48,24 +49,27 @@ public:
bool isDown : 1;
QBitmap mask;
QPixmap pixUp;
QPixmap pixDown;
};
+#if defined( _CC_GNU_ )
+ // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because
+ // in the BAD_ALLOC macro it uses std::cerr and friends :-(
+ typedef std::vector<Button, std::__allocator<Button, std::__new_alloc> > ButtonVector;
+#else
typedef std::vector<Button> ButtonVector;
+#endif
struct SkinButtonInfo
{
Command command;
const char *fileName;
ButtonType type;
};
- typedef std::vector<QBitmap> MaskVector;
- typedef std::vector<QPixmap> PixmapVector;
-
MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
virtual ~MediaWidget();
public slots:
virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
virtual void setLength( long length ) = 0;