From a478bc0582b02ee2473494919095d095f0c74ae6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 14 Feb 2015 17:55:27 -0500 Subject: [PATCH] tone_producer_demo: Delete workarounds for MetroWerks compiler bugs. There are a few left here that I didn't delete because the function does more than just call up to the parent class, so someone with more knowledge of the media kit than I do will have to go over those. --- .../tone_producer_demo/ToneProducer.cpp | 58 ------------------- .../tone_producer_demo/ToneProducer.h | 24 -------- 2 files changed, 82 deletions(-) diff --git a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp index 0afb24882b..32654e5445 100644 --- a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp +++ b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp @@ -620,16 +620,8 @@ ToneProducer::LatencyChanged( SetEventLatency(mLatency + mInternalLatency); } } -/* -// Workaround for a Metrowerks PPC compiler bug -status_t -ToneProducer::DeleteHook(BMediaNode* node) -{ - return BMediaEventLooper::DeleteHook(node); -} //#pragma mark - -*/ // BMediaEventLooper methods void @@ -679,30 +671,6 @@ ToneProducer::Stop(bigtime_t performance_time, bool immediate) BMediaEventLooper::Stop(performance_time, immediate); } -void -ToneProducer::Seek(bigtime_t media_time, bigtime_t performance_time) -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - BMediaEventLooper::Seek(media_time, performance_time); -} - -void -ToneProducer::TimeWarp(bigtime_t at_real_time, bigtime_t to_performance_time) -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - BMediaEventLooper::TimeWarp(at_real_time, to_performance_time); -} - -status_t -ToneProducer::AddTimer(bigtime_t at_performance_time, int32 cookie) -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - return BMediaEventLooper::AddTimer(at_performance_time, cookie); -} - void ToneProducer::SetRunMode(run_mode mode) { @@ -843,33 +811,7 @@ ToneProducer::HandleEvent(const media_timed_event* event, bigtime_t lateness, bo } } -/* -void -ToneProducer::CleanUpEvent(const media_timed_event *event) -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - BMediaEventLooper::CleanUpEvent(event); -} - -bigtime_t -ToneProducer::OfflineTime() -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - return BMediaEventLooper::OfflineTime(); -} - -void -ToneProducer::ControlLoop() -{ - // A bug in the current PowerPC compiler demands that we implement - // this, even though it just calls up to the inherited implementation. - BMediaEventLooper::ControlLoop(); -} - //#pragma mark - -*/ void ToneProducer::AllocateBuffers() diff --git a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.h b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.h index fb6edc7114..0c2194c053 100644 --- a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.h +++ b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.h @@ -160,15 +160,6 @@ public: // Workaround for a Metrowerks PPC compiler bug void Stop(bigtime_t performance_time, bool immediate); - // Workaround for a Metrowerks PPC compiler bug - void Seek(bigtime_t media_time, bigtime_t performance_time); - - // Workaround for a Metrowerks PPC compiler bug - void TimeWarp(bigtime_t at_real_time, bigtime_t to_performance_time); - - // Workaround for a Metrowerks PPC compiler bug - status_t AddTimer(bigtime_t at_performance_time, int32 cookie); - void SetRunMode(run_mode mode); void HandleEvent( @@ -176,21 +167,6 @@ public: bigtime_t lateness, bool realTimeEvent = false); -/* removed e.moon 2jun99 -protected: - // Workaround for a Metrowerks PPC compiler bug - void CleanUpEvent(const media_timed_event *event); - - // Workaround for a Metrowerks PPC compiler bug - bigtime_t OfflineTime(); - - // Workaround for a Metrowerks PPC compiler bug - void ControlLoop(); - - // Workaround for a Metrowerks PPC compiler bug - status_t DeleteHook(BMediaNode* node); -*/ - private: void AllocateBuffers(); BBuffer* FillNextBuffer(bigtime_t event_time);