* fixed GCC 4 build, thanks Fredrik Ekdahl
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21278 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "Controller.h"
|
#include "Controller.h"
|
||||||
|
|
||||||
|
#include <new>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <Debug.h>
|
#include <Debug.h>
|
||||||
@@ -41,6 +42,8 @@
|
|||||||
#include "MediaTrackVideoSupplier.h"
|
#include "MediaTrackVideoSupplier.h"
|
||||||
#include "VideoSupplier.h"
|
#include "VideoSupplier.h"
|
||||||
|
|
||||||
|
using std::nothrow;
|
||||||
|
|
||||||
|
|
||||||
#define AUDIO_PLAY_PRIORITY 110
|
#define AUDIO_PLAY_PRIORITY 110
|
||||||
#define VIDEO_PLAY_PRIORITY 20
|
#define VIDEO_PLAY_PRIORITY 20
|
||||||
@@ -73,6 +76,7 @@ void Controller::Listener::PlaybackStateChanged(uint32) {}
|
|||||||
void Controller::Listener::PositionChanged(float) {}
|
void Controller::Listener::PositionChanged(float) {}
|
||||||
void Controller::Listener::VolumeChanged(float) {}
|
void Controller::Listener::VolumeChanged(float) {}
|
||||||
|
|
||||||
|
|
||||||
// #pragma mark -
|
// #pragma mark -
|
||||||
|
|
||||||
|
|
||||||
@@ -84,8 +88,10 @@ Controller::Controller()
|
|||||||
, fVolume(1.0)
|
, fVolume(1.0)
|
||||||
|
|
||||||
, fMediaFile(0)
|
, fMediaFile(0)
|
||||||
|
// TODO: remove, InfoWin depends on it but should be fixed
|
||||||
,fAudioTrack(0)
|
,fAudioTrack(0)
|
||||||
,fVideoTrack(0)
|
,fVideoTrack(0)
|
||||||
|
//
|
||||||
, fDataLock("controller data lock")
|
, fDataLock("controller data lock")
|
||||||
|
|
||||||
, fVideoSupplier(NULL)
|
, fVideoSupplier(NULL)
|
||||||
|
|||||||
Reference in New Issue
Block a user