Hi all,
A friend of mine wanted to know if mythtv would compile with gcc4 so I
checkouted mythtv svn and fixed all problems with gcc 4.1 ( hence compiles
for all gcc 4.x ) . Also note that one fix is for the case where XVMC is
missing.
Please comment/apply.
Regards,
ismail
Index: libs/libmythtv/dummydtvrecorder.h
===================================================================
--- libs/libmythtv/dummydtvrecorder.h (revision 7653)
+++ libs/libmythtv/dummydtvrecorder.h (working copy)
@@ -13,14 +13,14 @@
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,7 +34,7 @@
void StopRecordingThread(void);
public slots:
- void DummyDTVRecorder::deleteLater(void);
+ void deleteLater(void);
private:
void Close(void);
Index: libs/libmythtv/mpeg/tspacket.h
===================================================================
--- libs/libmythtv/mpeg/tspacket.h (revision 7653)
+++ libs/libmythtv/mpeg/tspacket.h (working copy)
@@ -148,7 +148,7 @@
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];
};
Index: libs/libmythtv/avformatdecoder.cpp
===================================================================
--- libs/libmythtv/avformatdecoder.cpp (revision 7653)
+++ libs/libmythtv/avformatdecoder.cpp (working copy)
@@ -31,6 +31,14 @@
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
Index: libs/libmythtv/nuppeldecoder.h
===================================================================
--- libs/libmythtv/nuppeldecoder.h (revision 7653)
+++ libs/libmythtv/nuppeldecoder.h (working copy)
@@ -56,8 +56,8 @@
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);
Index: libs/libmythtv/dtvrecorder.h
===================================================================
--- libs/libmythtv/dtvrecorder.h (revision 7653)
+++ libs/libmythtv/dtvrecorder.h (working copy)
@@ -17,7 +17,7 @@
{
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),
Index: libs/libmythtv/previewgenerator.h
===================================================================
--- libs/libmythtv/previewgenerator.h (revision 7653)
+++ libs/libmythtv/previewgenerator.h (working copy)
@@ -41,7 +41,7 @@
emit previewThreadDone(filename);
}
- static void *PreviewGenerator::PreviewRun(void *param)
+ static void *PreviewRun(void *param)
{
PreviewGenerator *gen = (PreviewGenerator*) param;
gen->Run();
Index: libs/libmythtv/NuppelVideoRecorder.h
===================================================================
--- libs/libmythtv/NuppelVideoRecorder.h (revision 7653)
+++ libs/libmythtv/NuppelVideoRecorder.h (working copy)
@@ -108,7 +108,7 @@
void doVbiThread(void);
private:
- inline void NuppelVideoRecorder::WriteFrameheader(rtframeheader *fh);
+ inline void WriteFrameheader(rtframeheader *fh);
void InitBuffers(void);
void InitFilters(void);
Index: libs/libmythsoundtouch/SoundTouch.h
===================================================================
--- libs/libmythsoundtouch/SoundTouch.h (revision 7653)
+++ libs/libmythsoundtouch/SoundTouch.h (working copy)
@@ -159,7 +159,7 @@
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.
Index: libs/libmythsoundtouch/SoundTouch.cpp
===================================================================
--- libs/libmythsoundtouch/SoundTouch.cpp (revision 7653)
+++ libs/libmythsoundtouch/SoundTouch.cpp (working copy)
@@ -469,4 +469,4 @@
}
}
return 0;
-}
\ No newline at end of file
+}
Index: libs/libmyth/jsmenu.h
===================================================================
--- libs/libmyth/jsmenu.h (revision 7653)
+++ libs/libmyth/jsmenu.h (working copy)
@@ -76,7 +76,7 @@
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:
Index: programs/mythwelcome/welcomedialog.h
===================================================================
--- programs/mythwelcome/welcomedialog.h (revision 7653)
+++ programs/mythwelcome/welcomedialog.h (working copy)
@@ -48,7 +48,7 @@
bool checkConnectionToServer(void);
void runMythFillDatabase(void);
- UITextType* WelcomeDialog::getTextType(QString name);
+ UITextType* getTextType(QString name);
MythPopupBox *popup;
_______________________________________________
mythtv-dev mailing list
[email protected]
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
