Ticket #633: mythtv_gcc4.diff

libs/libmythtv/dummydtvrecorder.h

@@ -13 +13 @@
 class DummyDTVRecorder: public DTVRecorder
 {
   public:
-    DummyDTVRecorder::DummyDTVRecorder(
+    DummyDTVRecorder(
         TVRec *rec,
         bool tsmode = true,        RingBuffer *rbuffer = NULL,
         uint desired_width = 1920, uint desired_height = 1088,
         double desired_frame_rate = 29.97, uint bits_per_sec = 20000000,
         uint non_buf_frames = 0, bool autoStart = true);
 
-    DummyDTVRecorder::~DummyDTVRecorder();
+    ~DummyDTVRecorder();
 
     void SetOptionsFromProfile(RecordingProfile*, const QString&,
                                const QString&, const QString&, int) {;}
@@ -34 +34 @@
     void StopRecordingThread(void);
 
   public slots:
-    void DummyDTVRecorder::deleteLater(void);
+    void deleteLater(void);
 
   private:
     void Close(void);

libs/libmythtv/mpeg/tspacket.h

@@ -148 +148 @@
 
     static const unsigned int SIZE         = 188;
     static const unsigned int PAYLOAD_SIZE = SIZE-HEADER_SIZE;
-    static const TSPacket *TSPacket::NULL_PACKET;
+    static const TSPacket *NULL_PACKET;
   private:
     unsigned char _tspayload[184];
 };

libs/libmythtv/avformatdecoder.cpp

@@ -31 +31 @@
 
 extern pthread_mutex_t avcodeclock;
 
+#ifndef USING_XVMC
+int get_avf_buffer_xvmc(struct AVCodecContext *c, AVFrame *pic);
+int get_avf_buffer(struct AVCodecContext *c, AVFrame *pic);
+void release_avf_buffer(struct AVCodecContext *c, AVFrame *pic);
+void release_avf_buffer_xvmc(struct AVCodecContext *c, AVFrame *pic);
+void render_slice_xvmc(struct AVCodecContext *s, const AVFrame *src, int offset[4], int y, int type, int height);
+#endif
+
 void align_dimensions(AVCodecContext *avctx, int &width, int &height)
 {
     // minimum buffer alignment

libs/libmythtv/nuppeldecoder.h

@@ -56 +56 @@
     QString GetEncodingType(void) const;
 
   private:
-    inline bool NuppelDecoder::ReadFileheader(struct rtfileheader *fileheader);
-    inline bool NuppelDecoder::ReadFrameheader(struct rtframeheader *frameheader);
+    inline bool ReadFileheader(struct rtfileheader *fileheader);
+    inline bool ReadFrameheader(struct rtframeheader *frameheader);
 
     bool DecodeFrame(struct rtframeheader *frameheader,
                      unsigned char *lstrm, VideoFrame *frame);

libs/libmythtv/dtvrecorder.h

@@ -17 +17 @@
 {
     Q_OBJECT
   public:
-    DTVRecorder::DTVRecorder(TVRec *rec, const char *name = "DTVRecorder") : 
+    DTVRecorder(TVRec *rec, const char *name = "DTVRecorder") : 
         RecorderBase(rec, name),
         _first_keyframe(0), _position_within_gop_header(0),
         _keyframe_seen(false), _last_keyframe_seen(0), _last_gop_seen(0),

libs/libmythtv/previewgenerator.h

@@ -41 +41 @@
         emit previewThreadDone(filename);
     }
 
-    static void *PreviewGenerator::PreviewRun(void *param)
+    static void *PreviewRun(void *param)
     {
         PreviewGenerator *gen = (PreviewGenerator*) param;
         gen->Run();

libs/libmythtv/NuppelVideoRecorder.h

@@ -108 +108 @@
     void doVbiThread(void);
     
  private:
-    inline void NuppelVideoRecorder::WriteFrameheader(rtframeheader *fh);
+    inline void WriteFrameheader(rtframeheader *fh);
 
     void InitBuffers(void);
     void InitFilters(void);   

libs/libmythsoundtouch/SoundTouch.h

@@ -159 +159 @@
     static const char *getVersionString();
 
     /// Get SoundTouch library version Id
-    static uint SoundTouch::getVersionId();
+    static uint getVersionId();
 
     /// Sets new rate control value. Normal rate = 1.0, smaller values
     /// represent slower rate, larger faster rates.

libs/libmythsoundtouch/SoundTouch.cpp

@@ -469 +469 @@
         }
     }
     return 0;
-}
- No newline at end of file
+}

libs/libmyth/jsmenu.h

@@ -76 +76 @@
     
     void ButtonUp(int button);
     void AxisChange(int axis, int value);
-    void JoystickMenuClient::EmitKey(QString code);
+    void EmitKey(QString code);
     int  ReadConfig(QString config_file);
 
   private:

programs/mythwelcome/welcomedialog.h

@@ -48 +48 @@
     bool checkConnectionToServer(void);
     void runMythFillDatabase(void);
         
-    UITextType* WelcomeDialog::getTextType(QString name);
+    UITextType* getTextType(QString name);
     
     MythPopupBox *popup;