Browse Source

Add more functionality to the bink stubs to make them behave more like the previous implementation did when built without BINK_SDK_AVAILABLE.

In particular, the intro movie now exits immediately again rather than staying indefinitely.

The important difference is to send the completion callback in plBinkPlayer::NextFrame(), i.e. act as if we had reached the end of the movie.

Storing the filename is to keep plClient::IHandleMovieMsg() from deleting and recreating the plBinkPlayer on every message.

The changed return values are just to better match the previous behavior and probably don?t matter.
bink-stub
Christian Walther 12 years ago
parent
commit
f03a837642
  1. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/plLayerBink.h
  2. 34
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plBinkPlayer.h

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/plLayerBink.h

@ -50,7 +50,7 @@ class plLayerBink : public plLayerMovie
protected: protected:
virtual Int32 ISecsToFrame(float secs) { return 0; } virtual Int32 ISecsToFrame(float secs) { return 0; }
virtual hsBool IInit() { return true; } virtual hsBool IInit() { return true; }
virtual hsBool IGetCurrentFrame() { return 0; } virtual hsBool IGetCurrentFrame() { return true; }
virtual hsBool IRelease() { return true; } virtual hsBool IRelease() { return true; }
public: public:

34
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plBinkPlayer.h

@ -57,6 +57,9 @@ class plBinkPlayer
{ {
public: public:
plBinkPlayer() : fFileName(nil) { }
~plBinkPlayer() { delete [] fFileName; }
static bool Init( hsWindowHndl hWnd) { return true; } static bool Init( hsWindowHndl hWnd) { return true; }
static bool DeInit() { return true; } static bool DeInit() { return true; }
@ -67,15 +70,28 @@ class plBinkPlayer
void SetDefaults() { } void SetDefaults() { }
bool Start(plPipeline* pipe, hsWindowHndl hWnd) { return true; } bool Start(plPipeline* pipe, hsWindowHndl hWnd) { return false; }
bool NextFrame() { return false; } bool NextFrame() {
// we have reached the end
return Stop();
}
bool Pause(bool on) { return true; } bool Pause(bool on) { return false; }
bool Stop() { return true; } bool Stop() {
for (int i = 0; i < fCallbacks.GetCount(); i++)
fCallbacks[i]->Send();
fCallbacks.Reset();
delete [] fFileName;
fFileName = nil;
return false;
}
void SetFileName(const char* filename) { } void SetFileName(const char* filename) {
delete [] fFileName;
fFileName = hsStrcpy(filename);
}
void SetColor(const hsColorRGBA& c) { } void SetColor(const hsColorRGBA& c) { }
void SetPosition(float x, float y) { } void SetPosition(float x, float y) { }
void SetScale(float x, float y) { } void SetScale(float x, float y) { }
@ -86,14 +102,14 @@ class plBinkPlayer
void SetPosition(const hsPoint2& p) { } void SetPosition(const hsPoint2& p) { }
void SetScale(const hsPoint2& s) { } void SetScale(const hsPoint2& s) { }
const char* GetFileName() const { return NULL; } const char* GetFileName() const { return fFileName; }
const hsColorRGBA GetColor() const { return hsColorRGBA(); } const hsColorRGBA GetColor() const { return hsColorRGBA(); }
const hsPoint2 GetPosition() const { return hsPoint2(); } const hsPoint2 GetPosition() const { return hsPoint2(); }
const hsPoint2 GetScale() const { return hsPoint2(); } const hsPoint2 GetScale() const { return hsPoint2(); }
float GetBackVolume() const { return 0.0f; } float GetBackVolume() const { return 0.0f; }
float GetForeVolume() const { return 0.0f; } float GetForeVolume() const { return 0.0f; }
void AddCallback(plMessage* msg) { } void AddCallback(plMessage* msg) { hsRefCnt_SafeRef(msg); fCallbacks.Append(msg); }
UInt32 GetNumCallbacks() const { return 0; } UInt32 GetNumCallbacks() const { return 0; }
plMessage* GetCallback(int i) const { return nil; } plMessage* GetCallback(int i) const { return nil; }
@ -107,6 +123,10 @@ class plBinkPlayer
hsColorRGBA GetFadeFromColor() const { return hsColorRGBA(); } hsColorRGBA GetFadeFromColor() const { return hsColorRGBA(); }
float GetFadeToTime() const { return 0.0f; } float GetFadeToTime() const { return 0.0f; }
hsColorRGBA GetFadeToColor() const { return hsColorRGBA(); } hsColorRGBA GetFadeToColor() const { return hsColorRGBA(); }
private:
char* fFileName;
hsTArray<plMessage*> fCallbacks;
}; };
#endif // plBinkPlayer_inc #endif // plBinkPlayer_inc

Loading…
Cancel
Save