From 7c56890cb6e74ab97c77a38da8e71716aad896f1 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Tue, 6 Aug 2024 16:20:29 +0000 Subject: [PATCH] Remove all #if DEV test() functions --- src/audio.h | 4 ---- src/audioomx.cc | 20 -------------------- src/audioomx.h | 4 ---- src/audiowin.cc | 6 ------ src/audiowin.h | 3 --- src/video.h | 5 ----- src/videoomx.cc | 18 ------------------ src/videoomx.h | 5 ----- src/videowin.cc | 13 ------------- src/videowin.h | 4 ---- 10 files changed, 82 deletions(-) diff --git a/src/audio.h b/src/audio.h index 23948f6..e572721 100644 --- a/src/audio.h +++ b/src/audio.h @@ -84,10 +84,6 @@ class Audio : public DrainTarget, public AbstractOption const static u1 MPEG1_PES = 3; // unused const static u1 MP3 = 0; //media player -#ifdef DEV - virtual int test()=0; -#endif - protected: static Audio* instance; int initted; diff --git a/src/audioomx.cc b/src/audioomx.cc index 12dc5af..853db9f 100644 --- a/src/audioomx.cc +++ b/src/audioomx.cc @@ -1694,7 +1694,6 @@ int AudioOMX::reset() { if (!initted) return 0; - //test(); LogNT::getInstance()->debug(TAG, "reset called"); DeAllocateCodecsOMX(); @@ -1745,25 +1744,6 @@ int AudioOMX::setVolume(int tvolume) return 1; } -#ifdef DEV -int AudioOMX::test() -{ - // u8 stc = 0; - // return ioctl(fdAudio, AV_SET_AUD_STC, &stc); - - /* aud_sync_parms_t a; - a.parm1 = 0; - a.parm2 = 0; - */ - // int b = ioctl(fdAudio, AV_SET_AUD_DISABLE_SYNC, &a); - - - /*OK*/ //printf("Audio sync disable = %i\n", b); - - return 1; -} -#endif - unsigned int AudioOMX::AdvanceMpAudioSync(const u1* data, unsigned int size, unsigned int* framesize) { if (size <= 2) return size; // silly; diff --git a/src/audioomx.h b/src/audioomx.h index 224c3dc..45b4f49 100644 --- a/src/audioomx.h +++ b/src/audioomx.h @@ -95,10 +95,6 @@ class AudioOMX : public Audio bool addOptionsToPanes(int panenumber, Options* options, WOptionPane* pane); bool handleOptionChanges(Option* option); -#ifdef DEV - int test(); -#endif - private: int initAllParams(); u1 streamType; diff --git a/src/audiowin.cc b/src/audiowin.cc index fc4977d..aabfb2d 100644 --- a/src/audiowin.cc +++ b/src/audiowin.cc @@ -716,12 +716,6 @@ bool AudioWin::supportsAc3(){ return vw->supportsAc3(); } -#ifdef DEV -int AudioWin::test() -{ - return 0; -} -#endif diff --git a/src/audiowin.h b/src/audiowin.h index 8cc8a21..3365835 100644 --- a/src/audiowin.h +++ b/src/audiowin.h @@ -108,9 +108,6 @@ private: bool firstsynched; long winvolume; u1 aud_type; -#ifdef DEV - int test(); -#endif }; #endif diff --git a/src/video.h b/src/video.h index a77870a..16b2188 100644 --- a/src/video.h +++ b/src/video.h @@ -104,11 +104,6 @@ class Video: public DrainTarget, public AbstractOption virtual void turnVideoOff() {}; // virtual u8 frameNumberToTimecode(u4 timecode) { return 0; };//Obsolete and not HD compatible -#ifdef DEV - virtual int test() { return 0; } - virtual int test2() { return 0; } -#endif - int getMode() { return mode; } u1 getFormat() { return format; } u4 getScreenWidth() { return screenWidth; } diff --git a/src/videoomx.cc b/src/videoomx.cc index b83a155..89eb674 100644 --- a/src/videoomx.cc +++ b/src/videoomx.cc @@ -2752,24 +2752,6 @@ u4 VideoOMX::timecodeToFrameNumber(u8 timecode) } */ -#ifdef DEV -int VideoOMX::test() -{ - return 0; - - // u8 stc = 0; - // return ioctl(fdVideo, AV_SET_VID_STC, &stc); - /* - // reset(); - return 1; - */ -} - -int VideoOMX::test2() -{ - return 0; -} -#endif long long VideoOMX::SetStartOffset(long long curreftime, bool* rsync) { diff --git a/src/videoomx.h b/src/videoomx.h index 1a1e09e..f983aac 100644 --- a/src/videoomx.h +++ b/src/videoomx.h @@ -120,11 +120,6 @@ class VideoOMX : public Video bool addOptionsToPanes(int panenumber, Options *options, WOptionPane* pane); bool handleOptionChanges(Option* option); -#ifdef DEV - int test(); - int test2(); -#endif - static inline OMX_TICKS intToOMXTicks(long long pts) { OMX_TICKS temp; diff --git a/src/videowin.cc b/src/videowin.cc index 5edf764..18eeb60 100644 --- a/src/videowin.cc +++ b/src/videowin.cc @@ -2047,18 +2047,5 @@ bool VideoWin::changeAType(int type,IMediaSample* ms){ } } -#ifdef DEV -int VideoWin::test() -{ - return 0; -} - -int VideoWin::test2() -{ - return 0; -} -#endif - - diff --git a/src/videowin.h b/src/videowin.h index 86d39bf..83c9a25 100644 --- a/src/videowin.h +++ b/src/videowin.h @@ -157,10 +157,6 @@ public: bool selectVideoH264Filter(int filter); -#ifdef DEV - int test(); - int test2(); -#endif protected: bool setVideoDisplay(VideoDisplay display) { vd = display; return true; }; -- 2.39.5