From 0ad4577992e1245e1624fde3c525ca54ba6594f6 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Mon, 14 Mar 2022 21:25:52 +0000 Subject: [PATCH] Switch to cmake --- .gitignore | 10 +- GNUmakefile | 149 ------------------ build.sh | 20 +++ clean.sh | 2 + readme.win => docs/readme.win | 0 readme_media.txt => docs/readme_media.txt | 0 src/CMakeLists.txt | 116 ++++++++++++++ src/CMakeToolChainRPi.txt | 15 ++ Makefile.nmake => src/Makefile.nmake | 0 abstractoption.cc => src/abstractoption.cc | 0 abstractoption.h => src/abstractoption.h | 0 afeed.cc => src/afeed.cc | 0 afeed.h => src/afeed.h | 0 audio.cc => src/audio.cc | 0 audio.h => src/audio.h | 0 audioomx.cc => src/audioomx.cc | 0 audioomx.h => src/audioomx.h | 0 audioplayer.cc => src/audioplayer.cc | 0 audioplayer.h => src/audioplayer.h | 0 audiowin.cc => src/audiowin.cc | 0 audiowin.h => src/audiowin.h | 0 bitmap.cc => src/bitmap.cc | 0 bitmap.h => src/bitmap.h | 0 bogl.h => src/bogl.h | 0 boxstack.cc => src/boxstack.cc | 0 boxstack.h => src/boxstack.h | 0 boxx.cc => src/boxx.cc | 0 boxx.h => src/boxx.h | 0 buffer.cc => src/buffer.cc | 0 buffer.h => src/buffer.h | 0 callback.h => src/callback.h | 0 channel.cc => src/channel.cc | 0 channel.h => src/channel.h | 0 colour.cc => src/colour.cc | 0 colour.h => src/colour.h | 0 config.cc => src/config.cc | 0 config.h => src/config.h | 0 config.json.sample => src/config.json.sample | 0 control.cc => src/control.cc | 0 control.h => src/control.h | 0 defines.h => src/defines.h | 0 demuxer.cc => src/demuxer.cc | 0 demuxer.h => src/demuxer.h | 0 demuxeraudio.cc => src/demuxeraudio.cc | 0 demuxeraudio.h => src/demuxeraudio.h | 0 demuxermedia.cc => src/demuxermedia.cc | 0 demuxermedia.h => src/demuxermedia.h | 0 demuxerts.cc => src/demuxerts.cc | 0 demuxerts.h => src/demuxerts.h | 0 demuxervdr.cc => src/demuxervdr.cc | 0 demuxervdr.h => src/demuxervdr.h | 0 directory.cc => src/directory.cc | 0 directory.h => src/directory.h | 0 draintarget.h => src/draintarget.h | 0 dsallocator.cc => src/dsallocator.cc | 0 dsallocator.h => src/dsallocator.h | 0 dssourcefilter.cc => src/dssourcefilter.cc | 0 dssourcefilter.h => src/dssourcefilter.h | 0 dssourcepin.cc => src/dssourcepin.cc | 0 dssourcepin.h => src/dssourcepin.h | 0 dvbsubtitles.cc => src/dvbsubtitles.cc | 0 dvbsubtitles.h => src/dvbsubtitles.h | 0 .../eglpicturecreator.h | 0 event.cc => src/event.cc | 0 event.h => src/event.h | 0 eventdispatcher.cc => src/eventdispatcher.cc | 0 eventdispatcher.h => src/eventdispatcher.h | 0 feed.h => src/feed.h | 0 {fonts => src/fonts}/helvB18-ISO8859-1.pcf | Bin {fonts => src/fonts}/helvB18.bdf | 0 {fonts => src/fonts}/helvB18.cc | Bin {fonts => src/fonts}/helvB24-ISO8859-1.pcf | Bin {fonts => src/fonts}/helvB24.bdf | 0 {fonts => src/fonts}/helvB24.cc | Bin {fonts => src/fonts}/licensehelv.txt | 0 glosdshader.cc => src/glosdshader.cc | 0 glosdshader.h => src/glosdshader.h | 0 glshader.cc => src/glshader.cc | 0 glshader.h => src/glshader.h | 0 i18n.cc => src/i18n.cc | 0 i18n.h => src/i18n.h | 0 id3.h => src/id3.h | 0 image.cc => src/image.cc | 0 image.h => src/image.h | 0 imageloader.cc => src/imageloader.cc | 0 imageloader.h => src/imageloader.h | 0 imageomx.cc => src/imageomx.cc | 0 imageomx.h => src/imageomx.h | 0 imageomx2.cc => src/imageomx2.cc | 0 imageomx2.h => src/imageomx2.h | 0 imagereader.cc => src/imagereader.cc | 0 imagereader.h => src/imagereader.h | 0 input.cc => src/input.cc | 0 input.h => src/input.h | 0 inputcec.cc => src/inputcec.cc | 0 inputcec.h => src/inputcec.h | 0 inputlinux.cc => src/inputlinux.cc | 0 inputlinux.h => src/inputlinux.h | 0 inputlirc.cc => src/inputlirc.cc | 0 inputlirc.h => src/inputlirc.h | 0 inputman.cc => src/inputman.cc | 0 inputman.h => src/inputman.h | 0 inputudp.cc => src/inputudp.cc | 0 inputudp.h => src/inputudp.h | 0 inputwin.cc => src/inputwin.cc | 0 inputwin.h => src/inputwin.h | 0 language-data.h => src/language-data.h | 0 led.cc => src/led.cc | 0 led.h => src/led.h | 0 ledraspberry.cc => src/ledraspberry.cc | 0 ledraspberry.h => src/ledraspberry.h | 0 ledwin.cc => src/ledwin.cc | 0 ledwin.h => src/ledwin.h | 0 localmediafile.cc => src/localmediafile.cc | 0 localmediafile.h => src/localmediafile.h | 0 log.cc => src/log.cc | 0 log.h => src/log.h | 0 main.cc => src/main.cc | 0 mark.cc => src/mark.cc | 0 mark.h => src/mark.h | 0 media.cc => src/media.cc | 0 media.h => src/media.h | 0 mediafile.cc => src/mediafile.cc | 0 mediafile.h => src/mediafile.h | 0 mediaoptions.cc => src/mediaoptions.cc | 0 mediaoptions.h => src/mediaoptions.h | 0 mediaplayer.cc => src/mediaplayer.cc | 0 mediaplayer.h => src/mediaplayer.h | 0 mediaprovider.h => src/mediaprovider.h | 0 mediaproviderids.h => src/mediaproviderids.h | 0 message.cc => src/message.cc | 0 message.h => src/message.h | 0 messagequeue.cc => src/messagequeue.cc | 0 messagequeue.h => src/messagequeue.h | 0 movieinfo.cc => src/movieinfo.cc | 0 movieinfo.h => src/movieinfo.h | 0 objects.mk => src/objects.mk | 0 {omx => src/omx}/omx.cc | 0 {omx => src/omx}/omx.h | 0 {omx => src/omx}/omxeglrender.cc | 0 {omx => src/omx}/omxeglrender.h | 0 {omx => src/omx}/omximagedecode.cc | 0 {omx => src/omx}/omximagedecode.h | 0 option.cc => src/option.cc | 0 option.h => src/option.h | 0 osd.cc => src/osd.cc | 0 osd.h => src/osd.h | 0 osddirectfb.cc => src/osddirectfb.cc | 0 osddirectfb.h => src/osddirectfb.h | 0 osdopengl.cc => src/osdopengl.cc | 0 osdopengl.h => src/osdopengl.h | 0 osdopenvg.cc => src/osdopenvg.cc | 0 osdopenvg.h => src/osdopenvg.h | 0 osdreceiver.h => src/osdreceiver.h | 0 osdvector.cc => src/osdvector.cc | 0 osdvector.h => src/osdvector.h | 0 osdvectortypes.h => src/osdvectortypes.h | 0 osdwinpixel.cc => src/osdwinpixel.cc | 0 osdwinpixel.h => src/osdwinpixel.h | 0 osdwinvector.cc => src/osdwinvector.cc | 0 osdwinvector.h => src/osdwinvector.h | 0 {other => src/other}/defposter.png | Bin {other => src/other}/dolbyoff.png | Bin {other => src/other}/dolbyon.png | Bin {other => src/other}/hd1080i.png | Bin {other => src/other}/hd720p.png | Bin {other => src/other}/licence.txt | 0 {other => src/other}/properties.png | Bin {other => src/other}/radio.png | Bin {other => src/other}/recfolder.png | Bin {other => src/other}/recording.png | Bin {other => src/other}/recordings.png | Bin {other => src/other}/restart.png | Bin {other => src/other}/sd576i.png | Bin {other => src/other}/timers.png | Bin {other => src/other}/tv.png | Bin {other => src/other}/txtoff.png | Bin {other => src/other}/txton.png | Bin {other => src/other}/vdr.jpg | Bin {other => src/other}/vdrhires.jpg | Bin {other => src/other}/vdrhires.png | Bin {other => src/other}/wallpaper720p.jpg | Bin {other => src/other}/wallpaperNTSC.jpg | Bin {other => src/other}/wallpaperPAL.jpg | Bin playerlive.h => src/playerlive.h | 0 playermedia.cc => src/playermedia.cc | 0 playermedia.h => src/playermedia.h | 0 playerradiolive.cc => src/playerradiolive.cc | 0 playerradiolive.h => src/playerradiolive.h | 0 playerradiorec.cc => src/playerradiorec.cc | 0 playerradiorec.h => src/playerradiorec.h | 0 playervideolive.cc => src/playervideolive.cc | 0 playervideolive.h => src/playervideolive.h | 0 playervideorec.cc => src/playervideorec.cc | 0 playervideorec.h => src/playervideorec.h | 0 .../raspi-patches}/fetch_libav.sh | 0 .../raspi-patches}/libav_transcode.patch | 0 .../raspi-patches}/readme.txt | 0 recinfo.cc => src/recinfo.cc | 0 recinfo.h => src/recinfo.h | 0 recman.cc => src/recman.cc | 0 recman.h => src/recman.h | 0 recording.cc => src/recording.cc | 0 recording.h => src/recording.h | 0 rectimer.cc => src/rectimer.cc | 0 rectimer.h => src/rectimer.h | 0 region.cc => src/region.cc | 0 region.h => src/region.h | 0 serialize.cc => src/serialize.cc | 0 serialize.h => src/serialize.h | 0 seriesinfo.cc => src/seriesinfo.cc | 0 seriesinfo.h => src/seriesinfo.h | 0 sleeptimer.cc => src/sleeptimer.cc | 0 sleeptimer.h => src/sleeptimer.h | 0 staticartwork.h => src/staticartwork.h | 0 stream.cc => src/stream.cc | 0 stream.h => src/stream.h | 0 surface.cc => src/surface.cc | 0 surface.h => src/surface.h | 0 surfacedirectfb.cc => src/surfacedirectfb.cc | 0 surfacedirectfb.h => src/surfacedirectfb.h | 0 surfaceopengl.cc => src/surfaceopengl.cc | 0 surfaceopengl.h => src/surfaceopengl.h | 0 surfacevector.cc => src/surfacevector.cc | 0 surfacevector.h => src/surfacevector.h | 0 surfacewin.cc => src/surfacewin.cc | 0 surfacewin.h => src/surfacewin.h | 0 tbboxx.cc => src/tbboxx.cc | 0 tbboxx.h => src/tbboxx.h | 0 tcp.cc => src/tcp.cc | 0 tcp.h => src/tcp.h | 0 .../teletextdecodervbiebu.cc | 0 .../teletextdecodervbiebu.h | 0 {teletxt => src/teletxt}/COPYING | 0 {teletxt => src/teletxt}/README | 0 {teletxt => src/teletxt}/tables.h | 0 {teletxt => src/teletxt}/txtfont.cc | 0 {teletxt => src/teletxt}/txtfont.h | 0 tfeed.cc => src/tfeed.cc | 0 tfeed.h => src/tfeed.h | 0 thread.cc => src/thread.cc | 0 thread.h => src/thread.h | 0 threadp.cc => src/threadp.cc | 0 threadp.h => src/threadp.h | 0 threadpandroid.cc => src/threadpandroid.cc | 0 threadpandroid.h => src/threadpandroid.h | 0 threadsystem.h => src/threadsystem.h | 0 threadwin.cc => src/threadwin.cc | 0 threadwin.h => src/threadwin.h | 0 timerreceiver.h => src/timerreceiver.h | 0 timers.cc => src/timers.cc | 0 timers.h => src/timers.h | 0 udp4.cc => src/udp4.cc | 0 udp4.h => src/udp4.h | 0 udp6.cc => src/udp6.cc | 0 udp6.h => src/udp6.h | 0 util.cc => src/util.cc | 0 util.h => src/util.h | 0 vaudioselector.cc => src/vaudioselector.cc | 0 vaudioselector.h => src/vaudioselector.h | 0 vchannellist.cc => src/vchannellist.cc | 0 vchannellist.h => src/vchannellist.h | 0 vchannelselect.cc => src/vchannelselect.cc | 0 vchannelselect.h => src/vchannelselect.h | 0 vcolourtuner.cc => src/vcolourtuner.cc | 0 vcolourtuner.h => src/vcolourtuner.h | 0 vconnect.cc => src/vconnect.cc | 0 vconnect.h => src/vconnect.h | 0 vdpc.cc => src/vdpc.cc | 0 vdpc.h => src/vdpc.h | 0 vdr.cc => src/vdr.cc | 0 vdr.h => src/vdr.h | 0 vdrcommand.h => src/vdrcommand.h | 0 .../vdrrequestpacket.cc | 0 vdrrequestpacket.h => src/vdrrequestpacket.h | 0 .../vdrresponsepacket.cc | 0 .../vdrresponsepacket.h | 0 vepg.cc => src/vepg.cc | 0 vepg.h => src/vepg.h | 0 .../vepglistadvanced.cc | 0 vepglistadvanced.h => src/vepglistadvanced.h | 0 vepgsettimer.cc => src/vepgsettimer.cc | 0 vepgsettimer.h => src/vepgsettimer.h | 0 vepgsummary.cc => src/vepgsummary.cc | 0 vepgsummary.h => src/vepgsummary.h | 0 vfeed.cc => src/vfeed.cc | 0 vfeed.h => src/vfeed.h | 0 video.cc => src/video.cc | 0 video.h => src/video.h | 0 videoomx.cc => src/videoomx.cc | 0 videoomx.h => src/videoomx.h | 0 videowin.cc => src/videowin.cc | 0 videowin.h => src/videowin.h | 0 vinfo.cc => src/vinfo.cc | 0 vinfo.h => src/vinfo.h | 0 vmedialist.cc => src/vmedialist.cc | 0 vmedialist.h => src/vmedialist.h | 0 vmediaview.cc => src/vmediaview.cc | 0 vmediaview.h => src/vmediaview.h | 0 vmute.cc => src/vmute.cc | 0 vmute.h => src/vmute.h | 0 vompreswin.h => src/vompreswin.h | 0 vompwin.rc => src/vompwin.rc | 0 vopts.cc => src/vopts.cc | 0 vopts.h => src/vopts.h | 0 vpicturebanner.cc => src/vpicturebanner.cc | 0 vpicturebanner.h => src/vpicturebanner.h | 0 vquestion.cc => src/vquestion.cc | 0 vquestion.h => src/vquestion.h | 0 vradiorec.cc => src/vradiorec.cc | 0 vradiorec.h => src/vradiorec.h | 0 vrecmove.cc => src/vrecmove.cc | 0 vrecmove.h => src/vrecmove.h | 0 vrecording.cc => src/vrecording.cc | 0 vrecording.h => src/vrecording.h | 0 vrecordinglist.cc => src/vrecordinglist.cc | 0 vrecordinglist.h => src/vrecordinglist.h | 0 .../vrecordinglistadvanced.cc | 0 .../vrecordinglistadvanced.h | 0 .../vrecordinglistclassic.cc | 0 .../vrecordinglistclassic.h | 0 vrecordingmenu.cc => src/vrecordingmenu.cc | 0 vrecordingmenu.h => src/vrecordingmenu.h | 0 vscreensaver.cc => src/vscreensaver.cc | 0 vscreensaver.h => src/vscreensaver.h | 0 vserverselect.cc => src/vserverselect.cc | 0 vserverselect.h => src/vserverselect.h | 0 vteletextview.cc => src/vteletextview.cc | 0 vteletextview.h => src/vteletextview.h | 0 vtimeredit.cc => src/vtimeredit.cc | 0 vtimeredit.h => src/vtimeredit.h | 0 vtimerlist.cc => src/vtimerlist.cc | 0 vtimerlist.h => src/vtimerlist.h | 0 vvideolivetv.cc => src/vvideolivetv.cc | 0 vvideolivetv.h => src/vvideolivetv.h | 0 vvideomedia.cc => src/vvideomedia.cc | 0 vvideomedia.h => src/vvideomedia.h | 0 vvideorec.cc => src/vvideorec.cc | 0 vvideorec.h => src/vvideorec.h | 0 vvolume.cc => src/vvolume.cc | 0 vvolume.h => src/vvolume.h | 0 vwelcome.cc => src/vwelcome.cc | 0 vwelcome.h => src/vwelcome.h | 0 wbutton.cc => src/wbutton.cc | 0 wbutton.h => src/wbutton.h | 0 windowsosd.cc => src/windowsosd.cc | 0 windowsosd.h => src/windowsosd.h | 0 winmain.cc => src/winmain.cc | 0 wjpeg.cc => src/wjpeg.cc | 0 wjpeg.h => src/wjpeg.h | 0 wjpegcomplex.cc => src/wjpegcomplex.cc | 0 wjpegcomplex.h => src/wjpegcomplex.h | 0 wjpegsimple.cc => src/wjpegsimple.cc | 0 wjpegsimple.h => src/wjpegsimple.h | 0 wmovieview.cc => src/wmovieview.cc | 0 wmovieview.h => src/wmovieview.h | 0 wol.cc => src/wol.cc | 0 wol.h => src/wol.h | 0 woptionbox.cc => src/woptionbox.cc | 0 woptionbox.h => src/woptionbox.h | 0 woptionpane.cc => src/woptionpane.cc | 0 woptionpane.h => src/woptionpane.h | 0 wpictureview.cc => src/wpictureview.cc | 0 wpictureview.h => src/wpictureview.h | 0 wprogressbar.cc => src/wprogressbar.cc | 0 wprogressbar.h => src/wprogressbar.h | 0 wremoteconfig.cc => src/wremoteconfig.cc | 0 wremoteconfig.h => src/wremoteconfig.h | 0 wselectlist.cc => src/wselectlist.cc | 0 wselectlist.h => src/wselectlist.h | 0 wseriesview.cc => src/wseriesview.cc | 0 wseriesview.h => src/wseriesview.h | 0 wsymbol.cc => src/wsymbol.cc | 0 wsymbol.h => src/wsymbol.h | 0 wtabbar.cc => src/wtabbar.cc | 0 wtabbar.h => src/wtabbar.h | 0 wtextbox.cc => src/wtextbox.cc | 0 wtextbox.h => src/wtextbox.h | 0 wtvmedia.cc => src/wtvmedia.cc | 0 wtvmedia.h => src/wtvmedia.h | 0 wwinaudiofilter.cc => src/wwinaudiofilter.cc | 0 wwinaudiofilter.h => src/wwinaudiofilter.h | 0 .../wwinmp3audiofilter.cc | 0 .../wwinmp3audiofilter.h | 0 wwinvideofilter.cc => src/wwinvideofilter.cc | 0 wwinvideofilter.h => src/wwinvideofilter.h | 0 .../wwinvideoh264filter.cc | 0 .../wwinvideoh264filter.h | 0 388 files changed, 154 insertions(+), 158 deletions(-) delete mode 100644 GNUmakefile create mode 100755 build.sh create mode 100755 clean.sh rename readme.win => docs/readme.win (100%) rename readme_media.txt => docs/readme_media.txt (100%) create mode 100644 src/CMakeLists.txt create mode 100644 src/CMakeToolChainRPi.txt rename Makefile.nmake => src/Makefile.nmake (100%) rename abstractoption.cc => src/abstractoption.cc (100%) rename abstractoption.h => src/abstractoption.h (100%) rename afeed.cc => src/afeed.cc (100%) rename afeed.h => src/afeed.h (100%) rename audio.cc => src/audio.cc (100%) rename audio.h => src/audio.h (100%) rename audioomx.cc => src/audioomx.cc (100%) rename audioomx.h => src/audioomx.h (100%) rename audioplayer.cc => src/audioplayer.cc (100%) rename audioplayer.h => src/audioplayer.h (100%) rename audiowin.cc => src/audiowin.cc (100%) rename audiowin.h => src/audiowin.h (100%) rename bitmap.cc => src/bitmap.cc (100%) rename bitmap.h => src/bitmap.h (100%) rename bogl.h => src/bogl.h (100%) rename boxstack.cc => src/boxstack.cc (100%) rename boxstack.h => src/boxstack.h (100%) rename boxx.cc => src/boxx.cc (100%) rename boxx.h => src/boxx.h (100%) rename buffer.cc => src/buffer.cc (100%) rename buffer.h => src/buffer.h (100%) rename callback.h => src/callback.h (100%) rename channel.cc => src/channel.cc (100%) rename channel.h => src/channel.h (100%) rename colour.cc => src/colour.cc (100%) rename colour.h => src/colour.h (100%) rename config.cc => src/config.cc (100%) rename config.h => src/config.h (100%) rename config.json.sample => src/config.json.sample (100%) rename control.cc => src/control.cc (100%) rename control.h => src/control.h (100%) rename defines.h => src/defines.h (100%) rename demuxer.cc => src/demuxer.cc (100%) rename demuxer.h => src/demuxer.h (100%) rename demuxeraudio.cc => src/demuxeraudio.cc (100%) rename demuxeraudio.h => src/demuxeraudio.h (100%) rename demuxermedia.cc => src/demuxermedia.cc (100%) rename demuxermedia.h => src/demuxermedia.h (100%) rename demuxerts.cc => src/demuxerts.cc (100%) rename demuxerts.h => src/demuxerts.h (100%) rename demuxervdr.cc => src/demuxervdr.cc (100%) rename demuxervdr.h => src/demuxervdr.h (100%) rename directory.cc => src/directory.cc (100%) rename directory.h => src/directory.h (100%) rename draintarget.h => src/draintarget.h (100%) rename dsallocator.cc => src/dsallocator.cc (100%) rename dsallocator.h => src/dsallocator.h (100%) rename dssourcefilter.cc => src/dssourcefilter.cc (100%) rename dssourcefilter.h => src/dssourcefilter.h (100%) rename dssourcepin.cc => src/dssourcepin.cc (100%) rename dssourcepin.h => src/dssourcepin.h (100%) rename dvbsubtitles.cc => src/dvbsubtitles.cc (100%) rename dvbsubtitles.h => src/dvbsubtitles.h (100%) rename eglpicturecreator.h => src/eglpicturecreator.h (100%) rename event.cc => src/event.cc (100%) rename event.h => src/event.h (100%) rename eventdispatcher.cc => src/eventdispatcher.cc (100%) rename eventdispatcher.h => src/eventdispatcher.h (100%) rename feed.h => src/feed.h (100%) rename {fonts => src/fonts}/helvB18-ISO8859-1.pcf (100%) rename {fonts => src/fonts}/helvB18.bdf (100%) rename {fonts => src/fonts}/helvB18.cc (100%) rename {fonts => src/fonts}/helvB24-ISO8859-1.pcf (100%) rename {fonts => src/fonts}/helvB24.bdf (100%) rename {fonts => src/fonts}/helvB24.cc (100%) rename {fonts => src/fonts}/licensehelv.txt (100%) rename glosdshader.cc => src/glosdshader.cc (100%) rename glosdshader.h => src/glosdshader.h (100%) rename glshader.cc => src/glshader.cc (100%) rename glshader.h => src/glshader.h (100%) rename i18n.cc => src/i18n.cc (100%) rename i18n.h => src/i18n.h (100%) rename id3.h => src/id3.h (100%) rename image.cc => src/image.cc (100%) rename image.h => src/image.h (100%) rename imageloader.cc => src/imageloader.cc (100%) rename imageloader.h => src/imageloader.h (100%) rename imageomx.cc => src/imageomx.cc (100%) rename imageomx.h => src/imageomx.h (100%) rename imageomx2.cc => src/imageomx2.cc (100%) rename imageomx2.h => src/imageomx2.h (100%) rename imagereader.cc => src/imagereader.cc (100%) rename imagereader.h => src/imagereader.h (100%) rename input.cc => src/input.cc (100%) rename input.h => src/input.h (100%) rename inputcec.cc => src/inputcec.cc (100%) rename inputcec.h => src/inputcec.h (100%) rename inputlinux.cc => src/inputlinux.cc (100%) rename inputlinux.h => src/inputlinux.h (100%) rename inputlirc.cc => src/inputlirc.cc (100%) rename inputlirc.h => src/inputlirc.h (100%) rename inputman.cc => src/inputman.cc (100%) rename inputman.h => src/inputman.h (100%) rename inputudp.cc => src/inputudp.cc (100%) rename inputudp.h => src/inputudp.h (100%) rename inputwin.cc => src/inputwin.cc (100%) rename inputwin.h => src/inputwin.h (100%) rename language-data.h => src/language-data.h (100%) rename led.cc => src/led.cc (100%) rename led.h => src/led.h (100%) rename ledraspberry.cc => src/ledraspberry.cc (100%) rename ledraspberry.h => src/ledraspberry.h (100%) rename ledwin.cc => src/ledwin.cc (100%) rename ledwin.h => src/ledwin.h (100%) rename localmediafile.cc => src/localmediafile.cc (100%) rename localmediafile.h => src/localmediafile.h (100%) rename log.cc => src/log.cc (100%) rename log.h => src/log.h (100%) rename main.cc => src/main.cc (100%) rename mark.cc => src/mark.cc (100%) rename mark.h => src/mark.h (100%) rename media.cc => src/media.cc (100%) rename media.h => src/media.h (100%) rename mediafile.cc => src/mediafile.cc (100%) rename mediafile.h => src/mediafile.h (100%) rename mediaoptions.cc => src/mediaoptions.cc (100%) rename mediaoptions.h => src/mediaoptions.h (100%) rename mediaplayer.cc => src/mediaplayer.cc (100%) rename mediaplayer.h => src/mediaplayer.h (100%) rename mediaprovider.h => src/mediaprovider.h (100%) rename mediaproviderids.h => src/mediaproviderids.h (100%) rename message.cc => src/message.cc (100%) rename message.h => src/message.h (100%) rename messagequeue.cc => src/messagequeue.cc (100%) rename messagequeue.h => src/messagequeue.h (100%) rename movieinfo.cc => src/movieinfo.cc (100%) rename movieinfo.h => src/movieinfo.h (100%) rename objects.mk => src/objects.mk (100%) rename {omx => src/omx}/omx.cc (100%) rename {omx => src/omx}/omx.h (100%) rename {omx => src/omx}/omxeglrender.cc (100%) rename {omx => src/omx}/omxeglrender.h (100%) rename {omx => src/omx}/omximagedecode.cc (100%) rename {omx => src/omx}/omximagedecode.h (100%) rename option.cc => src/option.cc (100%) rename option.h => src/option.h (100%) rename osd.cc => src/osd.cc (100%) rename osd.h => src/osd.h (100%) rename osddirectfb.cc => src/osddirectfb.cc (100%) rename osddirectfb.h => src/osddirectfb.h (100%) rename osdopengl.cc => src/osdopengl.cc (100%) rename osdopengl.h => src/osdopengl.h (100%) rename osdopenvg.cc => src/osdopenvg.cc (100%) rename osdopenvg.h => src/osdopenvg.h (100%) rename osdreceiver.h => src/osdreceiver.h (100%) rename osdvector.cc => src/osdvector.cc (100%) rename osdvector.h => src/osdvector.h (100%) rename osdvectortypes.h => src/osdvectortypes.h (100%) rename osdwinpixel.cc => src/osdwinpixel.cc (100%) rename osdwinpixel.h => src/osdwinpixel.h (100%) rename osdwinvector.cc => src/osdwinvector.cc (100%) rename osdwinvector.h => src/osdwinvector.h (100%) rename {other => src/other}/defposter.png (100%) rename {other => src/other}/dolbyoff.png (100%) rename {other => src/other}/dolbyon.png (100%) rename {other => src/other}/hd1080i.png (100%) rename {other => src/other}/hd720p.png (100%) rename {other => src/other}/licence.txt (100%) rename {other => src/other}/properties.png (100%) rename {other => src/other}/radio.png (100%) rename {other => src/other}/recfolder.png (100%) rename {other => src/other}/recording.png (100%) rename {other => src/other}/recordings.png (100%) rename {other => src/other}/restart.png (100%) rename {other => src/other}/sd576i.png (100%) rename {other => src/other}/timers.png (100%) rename {other => src/other}/tv.png (100%) rename {other => src/other}/txtoff.png (100%) rename {other => src/other}/txton.png (100%) rename {other => src/other}/vdr.jpg (100%) rename {other => src/other}/vdrhires.jpg (100%) rename {other => src/other}/vdrhires.png (100%) rename {other => src/other}/wallpaper720p.jpg (100%) rename {other => src/other}/wallpaperNTSC.jpg (100%) rename {other => src/other}/wallpaperPAL.jpg (100%) rename playerlive.h => src/playerlive.h (100%) rename playermedia.cc => src/playermedia.cc (100%) rename playermedia.h => src/playermedia.h (100%) rename playerradiolive.cc => src/playerradiolive.cc (100%) rename playerradiolive.h => src/playerradiolive.h (100%) rename playerradiorec.cc => src/playerradiorec.cc (100%) rename playerradiorec.h => src/playerradiorec.h (100%) rename playervideolive.cc => src/playervideolive.cc (100%) rename playervideolive.h => src/playervideolive.h (100%) rename playervideorec.cc => src/playervideorec.cc (100%) rename playervideorec.h => src/playervideorec.h (100%) rename {raspi-patches => src/raspi-patches}/fetch_libav.sh (100%) rename {raspi-patches => src/raspi-patches}/libav_transcode.patch (100%) rename {raspi-patches => src/raspi-patches}/readme.txt (100%) rename recinfo.cc => src/recinfo.cc (100%) rename recinfo.h => src/recinfo.h (100%) rename recman.cc => src/recman.cc (100%) rename recman.h => src/recman.h (100%) rename recording.cc => src/recording.cc (100%) rename recording.h => src/recording.h (100%) rename rectimer.cc => src/rectimer.cc (100%) rename rectimer.h => src/rectimer.h (100%) rename region.cc => src/region.cc (100%) rename region.h => src/region.h (100%) rename serialize.cc => src/serialize.cc (100%) rename serialize.h => src/serialize.h (100%) rename seriesinfo.cc => src/seriesinfo.cc (100%) rename seriesinfo.h => src/seriesinfo.h (100%) rename sleeptimer.cc => src/sleeptimer.cc (100%) rename sleeptimer.h => src/sleeptimer.h (100%) rename staticartwork.h => src/staticartwork.h (100%) rename stream.cc => src/stream.cc (100%) rename stream.h => src/stream.h (100%) rename surface.cc => src/surface.cc (100%) rename surface.h => src/surface.h (100%) rename surfacedirectfb.cc => src/surfacedirectfb.cc (100%) rename surfacedirectfb.h => src/surfacedirectfb.h (100%) rename surfaceopengl.cc => src/surfaceopengl.cc (100%) rename surfaceopengl.h => src/surfaceopengl.h (100%) rename surfacevector.cc => src/surfacevector.cc (100%) rename surfacevector.h => src/surfacevector.h (100%) rename surfacewin.cc => src/surfacewin.cc (100%) rename surfacewin.h => src/surfacewin.h (100%) rename tbboxx.cc => src/tbboxx.cc (100%) rename tbboxx.h => src/tbboxx.h (100%) rename tcp.cc => src/tcp.cc (100%) rename tcp.h => src/tcp.h (100%) rename teletextdecodervbiebu.cc => src/teletextdecodervbiebu.cc (100%) rename teletextdecodervbiebu.h => src/teletextdecodervbiebu.h (100%) rename {teletxt => src/teletxt}/COPYING (100%) rename {teletxt => src/teletxt}/README (100%) rename {teletxt => src/teletxt}/tables.h (100%) rename {teletxt => src/teletxt}/txtfont.cc (100%) rename {teletxt => src/teletxt}/txtfont.h (100%) rename tfeed.cc => src/tfeed.cc (100%) rename tfeed.h => src/tfeed.h (100%) rename thread.cc => src/thread.cc (100%) rename thread.h => src/thread.h (100%) rename threadp.cc => src/threadp.cc (100%) rename threadp.h => src/threadp.h (100%) rename threadpandroid.cc => src/threadpandroid.cc (100%) rename threadpandroid.h => src/threadpandroid.h (100%) rename threadsystem.h => src/threadsystem.h (100%) rename threadwin.cc => src/threadwin.cc (100%) rename threadwin.h => src/threadwin.h (100%) rename timerreceiver.h => src/timerreceiver.h (100%) rename timers.cc => src/timers.cc (100%) rename timers.h => src/timers.h (100%) rename udp4.cc => src/udp4.cc (100%) rename udp4.h => src/udp4.h (100%) rename udp6.cc => src/udp6.cc (100%) rename udp6.h => src/udp6.h (100%) rename util.cc => src/util.cc (100%) rename util.h => src/util.h (100%) rename vaudioselector.cc => src/vaudioselector.cc (100%) rename vaudioselector.h => src/vaudioselector.h (100%) rename vchannellist.cc => src/vchannellist.cc (100%) rename vchannellist.h => src/vchannellist.h (100%) rename vchannelselect.cc => src/vchannelselect.cc (100%) rename vchannelselect.h => src/vchannelselect.h (100%) rename vcolourtuner.cc => src/vcolourtuner.cc (100%) rename vcolourtuner.h => src/vcolourtuner.h (100%) rename vconnect.cc => src/vconnect.cc (100%) rename vconnect.h => src/vconnect.h (100%) rename vdpc.cc => src/vdpc.cc (100%) rename vdpc.h => src/vdpc.h (100%) rename vdr.cc => src/vdr.cc (100%) rename vdr.h => src/vdr.h (100%) rename vdrcommand.h => src/vdrcommand.h (100%) rename vdrrequestpacket.cc => src/vdrrequestpacket.cc (100%) rename vdrrequestpacket.h => src/vdrrequestpacket.h (100%) rename vdrresponsepacket.cc => src/vdrresponsepacket.cc (100%) rename vdrresponsepacket.h => src/vdrresponsepacket.h (100%) rename vepg.cc => src/vepg.cc (100%) rename vepg.h => src/vepg.h (100%) rename vepglistadvanced.cc => src/vepglistadvanced.cc (100%) rename vepglistadvanced.h => src/vepglistadvanced.h (100%) rename vepgsettimer.cc => src/vepgsettimer.cc (100%) rename vepgsettimer.h => src/vepgsettimer.h (100%) rename vepgsummary.cc => src/vepgsummary.cc (100%) rename vepgsummary.h => src/vepgsummary.h (100%) rename vfeed.cc => src/vfeed.cc (100%) rename vfeed.h => src/vfeed.h (100%) rename video.cc => src/video.cc (100%) rename video.h => src/video.h (100%) rename videoomx.cc => src/videoomx.cc (100%) rename videoomx.h => src/videoomx.h (100%) rename videowin.cc => src/videowin.cc (100%) rename videowin.h => src/videowin.h (100%) rename vinfo.cc => src/vinfo.cc (100%) rename vinfo.h => src/vinfo.h (100%) rename vmedialist.cc => src/vmedialist.cc (100%) rename vmedialist.h => src/vmedialist.h (100%) rename vmediaview.cc => src/vmediaview.cc (100%) rename vmediaview.h => src/vmediaview.h (100%) rename vmute.cc => src/vmute.cc (100%) rename vmute.h => src/vmute.h (100%) rename vompreswin.h => src/vompreswin.h (100%) rename vompwin.rc => src/vompwin.rc (100%) rename vopts.cc => src/vopts.cc (100%) rename vopts.h => src/vopts.h (100%) rename vpicturebanner.cc => src/vpicturebanner.cc (100%) rename vpicturebanner.h => src/vpicturebanner.h (100%) rename vquestion.cc => src/vquestion.cc (100%) rename vquestion.h => src/vquestion.h (100%) rename vradiorec.cc => src/vradiorec.cc (100%) rename vradiorec.h => src/vradiorec.h (100%) rename vrecmove.cc => src/vrecmove.cc (100%) rename vrecmove.h => src/vrecmove.h (100%) rename vrecording.cc => src/vrecording.cc (100%) rename vrecording.h => src/vrecording.h (100%) rename vrecordinglist.cc => src/vrecordinglist.cc (100%) rename vrecordinglist.h => src/vrecordinglist.h (100%) rename vrecordinglistadvanced.cc => src/vrecordinglistadvanced.cc (100%) rename vrecordinglistadvanced.h => src/vrecordinglistadvanced.h (100%) rename vrecordinglistclassic.cc => src/vrecordinglistclassic.cc (100%) rename vrecordinglistclassic.h => src/vrecordinglistclassic.h (100%) rename vrecordingmenu.cc => src/vrecordingmenu.cc (100%) rename vrecordingmenu.h => src/vrecordingmenu.h (100%) rename vscreensaver.cc => src/vscreensaver.cc (100%) rename vscreensaver.h => src/vscreensaver.h (100%) rename vserverselect.cc => src/vserverselect.cc (100%) rename vserverselect.h => src/vserverselect.h (100%) rename vteletextview.cc => src/vteletextview.cc (100%) rename vteletextview.h => src/vteletextview.h (100%) rename vtimeredit.cc => src/vtimeredit.cc (100%) rename vtimeredit.h => src/vtimeredit.h (100%) rename vtimerlist.cc => src/vtimerlist.cc (100%) rename vtimerlist.h => src/vtimerlist.h (100%) rename vvideolivetv.cc => src/vvideolivetv.cc (100%) rename vvideolivetv.h => src/vvideolivetv.h (100%) rename vvideomedia.cc => src/vvideomedia.cc (100%) rename vvideomedia.h => src/vvideomedia.h (100%) rename vvideorec.cc => src/vvideorec.cc (100%) rename vvideorec.h => src/vvideorec.h (100%) rename vvolume.cc => src/vvolume.cc (100%) rename vvolume.h => src/vvolume.h (100%) rename vwelcome.cc => src/vwelcome.cc (100%) rename vwelcome.h => src/vwelcome.h (100%) rename wbutton.cc => src/wbutton.cc (100%) rename wbutton.h => src/wbutton.h (100%) rename windowsosd.cc => src/windowsosd.cc (100%) rename windowsosd.h => src/windowsosd.h (100%) rename winmain.cc => src/winmain.cc (100%) rename wjpeg.cc => src/wjpeg.cc (100%) rename wjpeg.h => src/wjpeg.h (100%) rename wjpegcomplex.cc => src/wjpegcomplex.cc (100%) rename wjpegcomplex.h => src/wjpegcomplex.h (100%) rename wjpegsimple.cc => src/wjpegsimple.cc (100%) rename wjpegsimple.h => src/wjpegsimple.h (100%) rename wmovieview.cc => src/wmovieview.cc (100%) rename wmovieview.h => src/wmovieview.h (100%) rename wol.cc => src/wol.cc (100%) rename wol.h => src/wol.h (100%) rename woptionbox.cc => src/woptionbox.cc (100%) rename woptionbox.h => src/woptionbox.h (100%) rename woptionpane.cc => src/woptionpane.cc (100%) rename woptionpane.h => src/woptionpane.h (100%) rename wpictureview.cc => src/wpictureview.cc (100%) rename wpictureview.h => src/wpictureview.h (100%) rename wprogressbar.cc => src/wprogressbar.cc (100%) rename wprogressbar.h => src/wprogressbar.h (100%) rename wremoteconfig.cc => src/wremoteconfig.cc (100%) rename wremoteconfig.h => src/wremoteconfig.h (100%) rename wselectlist.cc => src/wselectlist.cc (100%) rename wselectlist.h => src/wselectlist.h (100%) rename wseriesview.cc => src/wseriesview.cc (100%) rename wseriesview.h => src/wseriesview.h (100%) rename wsymbol.cc => src/wsymbol.cc (100%) rename wsymbol.h => src/wsymbol.h (100%) rename wtabbar.cc => src/wtabbar.cc (100%) rename wtabbar.h => src/wtabbar.h (100%) rename wtextbox.cc => src/wtextbox.cc (100%) rename wtextbox.h => src/wtextbox.h (100%) rename wtvmedia.cc => src/wtvmedia.cc (100%) rename wtvmedia.h => src/wtvmedia.h (100%) rename wwinaudiofilter.cc => src/wwinaudiofilter.cc (100%) rename wwinaudiofilter.h => src/wwinaudiofilter.h (100%) rename wwinmp3audiofilter.cc => src/wwinmp3audiofilter.cc (100%) rename wwinmp3audiofilter.h => src/wwinmp3audiofilter.h (100%) rename wwinvideofilter.cc => src/wwinvideofilter.cc (100%) rename wwinvideofilter.h => src/wwinvideofilter.h (100%) rename wwinvideoh264filter.cc => src/wwinvideoh264filter.cc (100%) rename wwinvideoh264filter.h => src/wwinvideoh264filter.h (100%) diff --git a/.gitignore b/.gitignore index 26a69ca..0974245 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,4 @@ -#do not include make output -*.o -vompclient -deps -#ignore target-* directory links -target-* *~ -#ignore eclipse project files -.project -.cproject .#* config.json +build diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 2d55693..0000000 --- a/GNUmakefile +++ /dev/null @@ -1,149 +0,0 @@ -# Switches for this Makefile: - -# VERBOSE - set to 1 to show all commands -# SKIPDEPS - Skip regeneration of dependencies file - -include objects.mk - -vomp_platform=$(shell ./select-platform) -# vomp_platform variable sets up the build on different platforms -# valid platforms are: -# raspberry - native compile for & on Raspberry Pi -# crossraspberry - cross compile for Raspberry Pi -# Override auto select here: -# vomp_platform= - -$(info Build system selected: $(vomp_platform)) - -ALL_THE_WARNINGS_OFF=0 - -CROSSROOT=/pi-root - -# uncomment the line below if you want to build vomp application without a reboot option, automatically set for windows! -#VOMP_OPTIONS+= -DVOMP_HAS_EXIT - -ifndef VERBOSE -Q = @ -endif - -# Pictures for linux builds -PICTURES = -Wl,--format=binary -PICTURES += -Wl,other/vdrhires.png -PICTURES += -Wl,other/wallpaper720p.jpg -PICTURES += -Wl,other/properties.png -PICTURES += -Wl,other/radio.png -PICTURES += -Wl,other/timers.png -PICTURES += -Wl,other/tv.png -PICTURES += -Wl,other/recordings.png -PICTURES += -Wl,other/restart.png -PICTURES += -Wl,other/hd1080i.png -PICTURES += -Wl,other/hd720p.png -PICTURES += -Wl,other/sd576i.png -PICTURES += -Wl,other/txtoff.png -PICTURES += -Wl,other/txton.png -PICTURES += -Wl,other/dolbyoff.png -PICTURES += -Wl,other/dolbyon.png -PICTURES += -Wl,other/recording.png -PICTURES += -Wl,other/recfolder.png -PICTURES += -Wl,other/defposter.png -PICTURES += -Wl,--format=default - -DEFINES=-D_GNU_SOURCE - - -ifeq ($(vomp_platform),raspberry) -$(info Raspberry Pi native compiler) -CC=gcc -STRIP=strip -CXX=g++ -LD=g++ - -#CC=clang-9 -#STRIP=strip -#CXX=clang++-9 -#LD=clang++-9 - -LDFLAGS = $(PICTURES) -#-fuse-ld=gold - -DEFINES += -DIPV4 -DIPV6 -LIBPATHS = -L/opt/vc/lib -L/usr/lib/arm-linux-gnueabihf -LIBS = -lpthread -lrt -lbrcmEGL -lbrcmOpenVG -lopenmaxil -lbcm_host -lavformat -lavcodec \ - -lavutil -lswresample -ljsoncpp -lfmt -ldl -lfontconfig -lfreetype -lMagick++-6.Q16 -OBJECTS = $(OBJ_COMMON) $(OBJ_RASPBERRY) -INCLUDES = -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/usr/include/freetype2 -I/usr/include/ImageMagick -I/usr/include/ImageMagick-6 -I/usr/include/arm-linux-gnueabihf/ImageMagick-6 -DEFINES += -DVOMP_PLATFORM_RASPBERRY -CXXFLAGS_EXTRA = -Wno-psabi -endif - - - -# Debian 10 x64 -# apt install g++-arm-linux-gnueabihf -# Set vomp_platform=crossraspberry above -ifeq ($(vomp_platform),crossraspberry) -SYSROOT= --sysroot=$(CROSSROOT) -DEFINES += -DIPV4 -DIPV6 -CROSS_PREFIX=arm-linux-gnueabihf- -CC=$(CROSS_PREFIX)gcc -STRIP=$(CROSS_PREFIX)strip -CXX=$(CROSS_PREFIX)g++ -LD=$(CROSS_PREFIX)g++ - -LDFLAGS = -Wall $(PICTURES) $(SYSROOT) \ - -Wl,-rpath-link,$(CROSSROOT)/opt/vc/lib -Wl,-rpath-link,$(CROSSROOT)/usr/lib/arm-linux-gnueabihf -LIBPATHS = -L=/opt/vc/lib -L=/usr/lib/arm-linux-gnueabihf -LIBS = -lpthread -lstdc++ -lrt -lbrcmEGL -lbrcmOpenVG -lopenmaxil -lbcm_host -lavformat -lavcodec \ - -lfmt -lavutil -lswresample -lm -ldl -lfontconfig -lfreetype -lMagick++-6.Q16 -lMagickWand-6.Q16 \ - -lMagickCore-6.Q16 -ljsoncpp -OBJECTS = $(OBJ_COMMON) $(OBJ_RASPBERRY) -INCLUDES = -isystem=/usr/include/arm-linux-gnueabihf -isystem=/opt/vc/include -isystem=/usr/include/freetype2 -isystem=/usr/include/arm-linux-gnueabihf/ImageMagick-6 -isystem=/usr/include/ImageMagick-6 -DEFINES += -DVOMP_PLATFORM_RASPBERRY -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16 -CXXFLAGS_EXTRA = $(SYSROOT) -Wno-psabi -mtune=cortex-a7 -mfloat-abi=hard -fopenmp -endif - - -ifeq ($(ALL_THE_WARNINGS_OFF),1) -CXXFLAGS_DEV = $(DEFINES) -DDEV -g -O0 -std=c++14 -Wno-deprecated $(CXXFLAGS_EXTRA) $(INCLUDES) -else -CXXFLAGS_DEV = $(DEFINES) -DDEV -g -O0 -Wall -Wextra -Wshadow -Werror=return-type -Wmissing-format-attribute -Wdisabled-optimization -Wmissing-declarations -Wmissing-noreturn -Winit-self -Woverloaded-virtual -Wold-style-cast -Wconversion -std=c++14 $(CXXFLAGS_EXTRA) $(INCLUDES) -endif - -CXXFLAGS_REL = $(DEFINES) -O3 -std=c++14 $(CXXFLAGS_EXTRA) $(INCLUDES) - -.PHONY: clean fresh all install strip - -default: dev -fresh: clean default - -%.o: %.cc - @echo CC $@ - $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< - -vompclient: $(OBJECTS) - @echo LD vompclient - $(Q)$(LD) $(LDFLAGS) $(LIBPATHS) -o vompclient $(OBJECTS) $(LIBS) - @echo Done - -strip: - @echo STRIP vompclient - $(Q)$(STRIP) vompclient - -dev: CXXFLAGS := $(CXXFLAGS_DEV) -dev: vompclient - -release: CXXFLAGS := $(CXXFLAGS_REL) -release: vompclient strip - -clean: - rm -f *.o deps vompclient *~ fonts/*.o fonts/*~ teletxt/*.o - -ifndef SKIPDEPS -deps: GNUmakefile - @echo "DEPS" - $(Q)$(CC) -MM $(SYSROOT) $(INCLUDES) $(OBJECTS:%.o=%.cc) > deps -endif - -ifneq ($(MAKECMDGOALS),clean) -include deps -endif diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..eb8b731 --- /dev/null +++ b/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +NATIVE=NO + +if grep -q BCM2708 /proc/cpuinfo ; then + NATIVE=yes +elif grep -q BCM2709 /proc/cpuinfo ; then + NATIVE=yes +elif grep -q BCM2835 /proc/cpuinfo ; then + NATIVE=yes +else + NATIVE=no +fi + +if [ $NATIVE == "no" ]; then + CROSS_COMPILE_INSERT=-DCMAKE_TOOLCHAIN_FILE=../src/CMakeToolChainRPi.txt +fi + +mkdir build +cmake $CROSS_COMPILE_INSERT -S src -B build && make -C build -j8 diff --git a/clean.sh b/clean.sh new file mode 100755 index 0000000..bc9bfaa --- /dev/null +++ b/clean.sh @@ -0,0 +1,2 @@ +#!/bin/bash +rm -rf build diff --git a/readme.win b/docs/readme.win similarity index 100% rename from readme.win rename to docs/readme.win diff --git a/readme_media.txt b/docs/readme_media.txt similarity index 100% rename from readme_media.txt rename to docs/readme_media.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..93b72c3 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,116 @@ +cmake_minimum_required(VERSION 3.13.4) + +set (VOMP_OBJ_COMMON + util.cc control.cc thread.cc timers.cc i18n.cc udp4.cc udp6.cc vdpc.cc tcp.cc + message.cc messagequeue.cc wol.cc audio.cc video.cc + vdr.cc recman.cc recording.cc recinfo.cc channel.cc rectimer.cc event.cc + directory.cc mark.cc option.cc vfeed.cc afeed.cc + demuxer.cc demuxervdr.cc demuxerts.cc stream.cc osd.cc surface.cc + region.cc colour.cc boxstack.cc boxx.cc tbboxx.cc vrecording.cc + vinfo.cc vquestion.cc vrecordinglist.cc vrecordinglistclassic.cc + vrecordinglistadvanced.cc vepgsummary.cc vepglistadvanced.cc + vmute.cc vvolume.cc vtimerlist.cc vtimeredit.cc vrecordingmenu.cc + vchannellist.cc vwelcome.cc vvideorec.cc vepgsettimer.cc + vchannelselect.cc vserverselect.cc vconnect.cc vepg.cc vrecmove.cc + vradiorec.cc vaudioselector.cc vscreensaver.cc vopts.cc + wselectlist.cc wjpeg.cc wsymbol.cc wbutton.cc wtextbox.cc + woptionpane.cc woptionbox.cc wremoteconfig.cc wtabbar.cc led.cc + inputman.cc input.cc inputudp.cc inputlirc.cc vpicturebanner.cc + abstractoption.cc eventdispatcher.cc vdrrequestpacket.cc + vdrresponsepacket.cc vvideolivetv.cc sleeptimer.cc + wprogressbar.cc bitmap.cc dvbsubtitles.cc tfeed.cc vteletextview.cc + teletextdecodervbiebu.cc teletxt/txtfont.cc movieinfo.cc seriesinfo.cc + wmovieview.cc wseriesview.cc wtvmedia.cc wpictureview.cc + osdvector.cc surfacevector.cc buffer.cc config.cc log.cc + playervideorec.cc playervideolive.cc playerradiolive.cc playerradiorec.cc + imageloader.cc image.cc +) + +set (VOMP_OBJ_RASPBERRY + main.cc threadp.cc osdopenvg.cc ledraspberry.cc videoomx.cc audioomx.cc imageomx.cc + wjpegsimple.cc inputlinux.cc inputcec.cc + omx/omx.cc omx/omximagedecode.cc omx/omxeglrender.cc imageomx2.cc +) + +# +#OBJ_WINDOWS = winmain.o threadwin.o inputwin.o ledwin.o videowin.o \ +# audiowin.o windowsosd.o dsallocator.o dssourcefilter.o dssourcepin.o \ +# wwinvideofilter.o wwinvideoh264filter.o wwinaudiofilter.o \ +# wwinmp3audiofilter.o wjpegsimple.o +# +#OBJ_WINLEGACY = osdwinpixel.o surfacewin.o \ +# fonts/helvB24.o fonts/helvB18.o +# +#OBJ_WINCURRENT = osdwinvector.o +# + +set (PNG_FILES + other/vdrhires.png + other/wallpaper720p.jpg + other/properties.png + other/radio.png + other/timers.png + other/tv.png + other/recordings.png + other/restart.png + other/hd1080i.png + other/hd720p.png + other/sd576i.png + other/txtoff.png + other/txton.png + other/dolbyoff.png + other/dolbyon.png + other/recording.png + other/recfolder.png + other/defposter.png +) + +project(vomp) +add_executable(vomp ${VOMP_OBJ_COMMON} ${VOMP_OBJ_RASPBERRY} pngs.o) + +set(CMAKE_BUILD_TYPE Debug) +target_compile_options(vomp PRIVATE -O0) + +set_property(TARGET vomp PROPERTY CXX_STANDARD 14) + +find_path(INC_VC bcm_host.h PATHS /opt/vc/include) +find_path(INC_FT2 ft2build.h PATHS /usr/include/freetype2) +find_path(INC_MAGICK Magick++.h PATHS /usr/include/ImageMagick-6) +find_path(INC_MAGICK2 magick/magick-baseconfig.h PATHS /usr/include/arm-linux-gnueabihf/ImageMagick-6) + +target_include_directories(vomp SYSTEM PRIVATE ${INC_VC} ${INC_FT2} ${INC_MAGICK} ${INC_MAGICK2}) + +target_compile_options(vomp PRIVATE + -Werror=return-type + -Wall + -Wextra + -Wshadow + -Wmissing-declarations + -Winit-self + -Woverloaded-virtual + -Wold-style-cast + -Wconversion + -Wmissing-format-attribute + -Wdisabled-optimization + -Wmissing-noreturn +) + +target_compile_options(vomp PRIVATE + -D_GNU_SOURCE -DIPV4 -DIPV6 -DVOMP_PLATFORM_RASPBERRY -DMAGICKCORE_HDRI_ENABLE=0 + -DMAGICKCORE_QUANTUM_DEPTH=16 -DDEV) + +target_link_libraries(vomp + pthread stdc++ rt brcmEGL brcmOpenVG openmaxil bcm_host avformat avcodec + fmt avutil swresample m dl fontconfig freetype Magick++-6.Q16 + MagickWand-6.Q16 MagickCore-6.Q16 jsoncpp) + +target_link_directories(vomp PRIVATE + ${CMAKE_SYSROOT}/opt/vc/lib + ${CMAKE_SYSROOT}/usr/lib/arm-linux-gnueabihf) + +add_custom_command( + OUTPUT pngs.o + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMENT pngs.o + COMMAND ${CMAKE_LINKER} -r -b binary -o ../build/pngs.o ${PNG_FILES} +) diff --git a/src/CMakeToolChainRPi.txt b/src/CMakeToolChainRPi.txt new file mode 100644 index 0000000..48ee17e --- /dev/null +++ b/src/CMakeToolChainRPi.txt @@ -0,0 +1,15 @@ +set(CMAKE_SYSTEM_NAME Linux) + +set(CMAKE_C_COMPILER /usr/bin/arm-linux-gnueabihf-gcc) +set(CMAKE_CXX_COMPILER /usr/bin/arm-linux-gnueabihf-g++) + +set(CMAKE_FIND_ROOT_PATH /pi-root) +set(CMAKE_SYSROOT /pi-root) + +set(CMAKE_C_FLAGS "-Wno-psabi -mtune=cortex-a7 -mfloat-abi=hard -fopenmp") +set(CMAKE_CXX_FLAGS "-Wno-psabi -mtune=cortex-a7 -mfloat-abi=hard -fopenmp") + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/Makefile.nmake b/src/Makefile.nmake similarity index 100% rename from Makefile.nmake rename to src/Makefile.nmake diff --git a/abstractoption.cc b/src/abstractoption.cc similarity index 100% rename from abstractoption.cc rename to src/abstractoption.cc diff --git a/abstractoption.h b/src/abstractoption.h similarity index 100% rename from abstractoption.h rename to src/abstractoption.h diff --git a/afeed.cc b/src/afeed.cc similarity index 100% rename from afeed.cc rename to src/afeed.cc diff --git a/afeed.h b/src/afeed.h similarity index 100% rename from afeed.h rename to src/afeed.h diff --git a/audio.cc b/src/audio.cc similarity index 100% rename from audio.cc rename to src/audio.cc diff --git a/audio.h b/src/audio.h similarity index 100% rename from audio.h rename to src/audio.h diff --git a/audioomx.cc b/src/audioomx.cc similarity index 100% rename from audioomx.cc rename to src/audioomx.cc diff --git a/audioomx.h b/src/audioomx.h similarity index 100% rename from audioomx.h rename to src/audioomx.h diff --git a/audioplayer.cc b/src/audioplayer.cc similarity index 100% rename from audioplayer.cc rename to src/audioplayer.cc diff --git a/audioplayer.h b/src/audioplayer.h similarity index 100% rename from audioplayer.h rename to src/audioplayer.h diff --git a/audiowin.cc b/src/audiowin.cc similarity index 100% rename from audiowin.cc rename to src/audiowin.cc diff --git a/audiowin.h b/src/audiowin.h similarity index 100% rename from audiowin.h rename to src/audiowin.h diff --git a/bitmap.cc b/src/bitmap.cc similarity index 100% rename from bitmap.cc rename to src/bitmap.cc diff --git a/bitmap.h b/src/bitmap.h similarity index 100% rename from bitmap.h rename to src/bitmap.h diff --git a/bogl.h b/src/bogl.h similarity index 100% rename from bogl.h rename to src/bogl.h diff --git a/boxstack.cc b/src/boxstack.cc similarity index 100% rename from boxstack.cc rename to src/boxstack.cc diff --git a/boxstack.h b/src/boxstack.h similarity index 100% rename from boxstack.h rename to src/boxstack.h diff --git a/boxx.cc b/src/boxx.cc similarity index 100% rename from boxx.cc rename to src/boxx.cc diff --git a/boxx.h b/src/boxx.h similarity index 100% rename from boxx.h rename to src/boxx.h diff --git a/buffer.cc b/src/buffer.cc similarity index 100% rename from buffer.cc rename to src/buffer.cc diff --git a/buffer.h b/src/buffer.h similarity index 100% rename from buffer.h rename to src/buffer.h diff --git a/callback.h b/src/callback.h similarity index 100% rename from callback.h rename to src/callback.h diff --git a/channel.cc b/src/channel.cc similarity index 100% rename from channel.cc rename to src/channel.cc diff --git a/channel.h b/src/channel.h similarity index 100% rename from channel.h rename to src/channel.h diff --git a/colour.cc b/src/colour.cc similarity index 100% rename from colour.cc rename to src/colour.cc diff --git a/colour.h b/src/colour.h similarity index 100% rename from colour.h rename to src/colour.h diff --git a/config.cc b/src/config.cc similarity index 100% rename from config.cc rename to src/config.cc diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/config.json.sample b/src/config.json.sample similarity index 100% rename from config.json.sample rename to src/config.json.sample diff --git a/control.cc b/src/control.cc similarity index 100% rename from control.cc rename to src/control.cc diff --git a/control.h b/src/control.h similarity index 100% rename from control.h rename to src/control.h diff --git a/defines.h b/src/defines.h similarity index 100% rename from defines.h rename to src/defines.h diff --git a/demuxer.cc b/src/demuxer.cc similarity index 100% rename from demuxer.cc rename to src/demuxer.cc diff --git a/demuxer.h b/src/demuxer.h similarity index 100% rename from demuxer.h rename to src/demuxer.h diff --git a/demuxeraudio.cc b/src/demuxeraudio.cc similarity index 100% rename from demuxeraudio.cc rename to src/demuxeraudio.cc diff --git a/demuxeraudio.h b/src/demuxeraudio.h similarity index 100% rename from demuxeraudio.h rename to src/demuxeraudio.h diff --git a/demuxermedia.cc b/src/demuxermedia.cc similarity index 100% rename from demuxermedia.cc rename to src/demuxermedia.cc diff --git a/demuxermedia.h b/src/demuxermedia.h similarity index 100% rename from demuxermedia.h rename to src/demuxermedia.h diff --git a/demuxerts.cc b/src/demuxerts.cc similarity index 100% rename from demuxerts.cc rename to src/demuxerts.cc diff --git a/demuxerts.h b/src/demuxerts.h similarity index 100% rename from demuxerts.h rename to src/demuxerts.h diff --git a/demuxervdr.cc b/src/demuxervdr.cc similarity index 100% rename from demuxervdr.cc rename to src/demuxervdr.cc diff --git a/demuxervdr.h b/src/demuxervdr.h similarity index 100% rename from demuxervdr.h rename to src/demuxervdr.h diff --git a/directory.cc b/src/directory.cc similarity index 100% rename from directory.cc rename to src/directory.cc diff --git a/directory.h b/src/directory.h similarity index 100% rename from directory.h rename to src/directory.h diff --git a/draintarget.h b/src/draintarget.h similarity index 100% rename from draintarget.h rename to src/draintarget.h diff --git a/dsallocator.cc b/src/dsallocator.cc similarity index 100% rename from dsallocator.cc rename to src/dsallocator.cc diff --git a/dsallocator.h b/src/dsallocator.h similarity index 100% rename from dsallocator.h rename to src/dsallocator.h diff --git a/dssourcefilter.cc b/src/dssourcefilter.cc similarity index 100% rename from dssourcefilter.cc rename to src/dssourcefilter.cc diff --git a/dssourcefilter.h b/src/dssourcefilter.h similarity index 100% rename from dssourcefilter.h rename to src/dssourcefilter.h diff --git a/dssourcepin.cc b/src/dssourcepin.cc similarity index 100% rename from dssourcepin.cc rename to src/dssourcepin.cc diff --git a/dssourcepin.h b/src/dssourcepin.h similarity index 100% rename from dssourcepin.h rename to src/dssourcepin.h diff --git a/dvbsubtitles.cc b/src/dvbsubtitles.cc similarity index 100% rename from dvbsubtitles.cc rename to src/dvbsubtitles.cc diff --git a/dvbsubtitles.h b/src/dvbsubtitles.h similarity index 100% rename from dvbsubtitles.h rename to src/dvbsubtitles.h diff --git a/eglpicturecreator.h b/src/eglpicturecreator.h similarity index 100% rename from eglpicturecreator.h rename to src/eglpicturecreator.h diff --git a/event.cc b/src/event.cc similarity index 100% rename from event.cc rename to src/event.cc diff --git a/event.h b/src/event.h similarity index 100% rename from event.h rename to src/event.h diff --git a/eventdispatcher.cc b/src/eventdispatcher.cc similarity index 100% rename from eventdispatcher.cc rename to src/eventdispatcher.cc diff --git a/eventdispatcher.h b/src/eventdispatcher.h similarity index 100% rename from eventdispatcher.h rename to src/eventdispatcher.h diff --git a/feed.h b/src/feed.h similarity index 100% rename from feed.h rename to src/feed.h diff --git a/fonts/helvB18-ISO8859-1.pcf b/src/fonts/helvB18-ISO8859-1.pcf similarity index 100% rename from fonts/helvB18-ISO8859-1.pcf rename to src/fonts/helvB18-ISO8859-1.pcf diff --git a/fonts/helvB18.bdf b/src/fonts/helvB18.bdf similarity index 100% rename from fonts/helvB18.bdf rename to src/fonts/helvB18.bdf diff --git a/fonts/helvB18.cc b/src/fonts/helvB18.cc similarity index 100% rename from fonts/helvB18.cc rename to src/fonts/helvB18.cc diff --git a/fonts/helvB24-ISO8859-1.pcf b/src/fonts/helvB24-ISO8859-1.pcf similarity index 100% rename from fonts/helvB24-ISO8859-1.pcf rename to src/fonts/helvB24-ISO8859-1.pcf diff --git a/fonts/helvB24.bdf b/src/fonts/helvB24.bdf similarity index 100% rename from fonts/helvB24.bdf rename to src/fonts/helvB24.bdf diff --git a/fonts/helvB24.cc b/src/fonts/helvB24.cc similarity index 100% rename from fonts/helvB24.cc rename to src/fonts/helvB24.cc diff --git a/fonts/licensehelv.txt b/src/fonts/licensehelv.txt similarity index 100% rename from fonts/licensehelv.txt rename to src/fonts/licensehelv.txt diff --git a/glosdshader.cc b/src/glosdshader.cc similarity index 100% rename from glosdshader.cc rename to src/glosdshader.cc diff --git a/glosdshader.h b/src/glosdshader.h similarity index 100% rename from glosdshader.h rename to src/glosdshader.h diff --git a/glshader.cc b/src/glshader.cc similarity index 100% rename from glshader.cc rename to src/glshader.cc diff --git a/glshader.h b/src/glshader.h similarity index 100% rename from glshader.h rename to src/glshader.h diff --git a/i18n.cc b/src/i18n.cc similarity index 100% rename from i18n.cc rename to src/i18n.cc diff --git a/i18n.h b/src/i18n.h similarity index 100% rename from i18n.h rename to src/i18n.h diff --git a/id3.h b/src/id3.h similarity index 100% rename from id3.h rename to src/id3.h diff --git a/image.cc b/src/image.cc similarity index 100% rename from image.cc rename to src/image.cc diff --git a/image.h b/src/image.h similarity index 100% rename from image.h rename to src/image.h diff --git a/imageloader.cc b/src/imageloader.cc similarity index 100% rename from imageloader.cc rename to src/imageloader.cc diff --git a/imageloader.h b/src/imageloader.h similarity index 100% rename from imageloader.h rename to src/imageloader.h diff --git a/imageomx.cc b/src/imageomx.cc similarity index 100% rename from imageomx.cc rename to src/imageomx.cc diff --git a/imageomx.h b/src/imageomx.h similarity index 100% rename from imageomx.h rename to src/imageomx.h diff --git a/imageomx2.cc b/src/imageomx2.cc similarity index 100% rename from imageomx2.cc rename to src/imageomx2.cc diff --git a/imageomx2.h b/src/imageomx2.h similarity index 100% rename from imageomx2.h rename to src/imageomx2.h diff --git a/imagereader.cc b/src/imagereader.cc similarity index 100% rename from imagereader.cc rename to src/imagereader.cc diff --git a/imagereader.h b/src/imagereader.h similarity index 100% rename from imagereader.h rename to src/imagereader.h diff --git a/input.cc b/src/input.cc similarity index 100% rename from input.cc rename to src/input.cc diff --git a/input.h b/src/input.h similarity index 100% rename from input.h rename to src/input.h diff --git a/inputcec.cc b/src/inputcec.cc similarity index 100% rename from inputcec.cc rename to src/inputcec.cc diff --git a/inputcec.h b/src/inputcec.h similarity index 100% rename from inputcec.h rename to src/inputcec.h diff --git a/inputlinux.cc b/src/inputlinux.cc similarity index 100% rename from inputlinux.cc rename to src/inputlinux.cc diff --git a/inputlinux.h b/src/inputlinux.h similarity index 100% rename from inputlinux.h rename to src/inputlinux.h diff --git a/inputlirc.cc b/src/inputlirc.cc similarity index 100% rename from inputlirc.cc rename to src/inputlirc.cc diff --git a/inputlirc.h b/src/inputlirc.h similarity index 100% rename from inputlirc.h rename to src/inputlirc.h diff --git a/inputman.cc b/src/inputman.cc similarity index 100% rename from inputman.cc rename to src/inputman.cc diff --git a/inputman.h b/src/inputman.h similarity index 100% rename from inputman.h rename to src/inputman.h diff --git a/inputudp.cc b/src/inputudp.cc similarity index 100% rename from inputudp.cc rename to src/inputudp.cc diff --git a/inputudp.h b/src/inputudp.h similarity index 100% rename from inputudp.h rename to src/inputudp.h diff --git a/inputwin.cc b/src/inputwin.cc similarity index 100% rename from inputwin.cc rename to src/inputwin.cc diff --git a/inputwin.h b/src/inputwin.h similarity index 100% rename from inputwin.h rename to src/inputwin.h diff --git a/language-data.h b/src/language-data.h similarity index 100% rename from language-data.h rename to src/language-data.h diff --git a/led.cc b/src/led.cc similarity index 100% rename from led.cc rename to src/led.cc diff --git a/led.h b/src/led.h similarity index 100% rename from led.h rename to src/led.h diff --git a/ledraspberry.cc b/src/ledraspberry.cc similarity index 100% rename from ledraspberry.cc rename to src/ledraspberry.cc diff --git a/ledraspberry.h b/src/ledraspberry.h similarity index 100% rename from ledraspberry.h rename to src/ledraspberry.h diff --git a/ledwin.cc b/src/ledwin.cc similarity index 100% rename from ledwin.cc rename to src/ledwin.cc diff --git a/ledwin.h b/src/ledwin.h similarity index 100% rename from ledwin.h rename to src/ledwin.h diff --git a/localmediafile.cc b/src/localmediafile.cc similarity index 100% rename from localmediafile.cc rename to src/localmediafile.cc diff --git a/localmediafile.h b/src/localmediafile.h similarity index 100% rename from localmediafile.h rename to src/localmediafile.h diff --git a/log.cc b/src/log.cc similarity index 100% rename from log.cc rename to src/log.cc diff --git a/log.h b/src/log.h similarity index 100% rename from log.h rename to src/log.h diff --git a/main.cc b/src/main.cc similarity index 100% rename from main.cc rename to src/main.cc diff --git a/mark.cc b/src/mark.cc similarity index 100% rename from mark.cc rename to src/mark.cc diff --git a/mark.h b/src/mark.h similarity index 100% rename from mark.h rename to src/mark.h diff --git a/media.cc b/src/media.cc similarity index 100% rename from media.cc rename to src/media.cc diff --git a/media.h b/src/media.h similarity index 100% rename from media.h rename to src/media.h diff --git a/mediafile.cc b/src/mediafile.cc similarity index 100% rename from mediafile.cc rename to src/mediafile.cc diff --git a/mediafile.h b/src/mediafile.h similarity index 100% rename from mediafile.h rename to src/mediafile.h diff --git a/mediaoptions.cc b/src/mediaoptions.cc similarity index 100% rename from mediaoptions.cc rename to src/mediaoptions.cc diff --git a/mediaoptions.h b/src/mediaoptions.h similarity index 100% rename from mediaoptions.h rename to src/mediaoptions.h diff --git a/mediaplayer.cc b/src/mediaplayer.cc similarity index 100% rename from mediaplayer.cc rename to src/mediaplayer.cc diff --git a/mediaplayer.h b/src/mediaplayer.h similarity index 100% rename from mediaplayer.h rename to src/mediaplayer.h diff --git a/mediaprovider.h b/src/mediaprovider.h similarity index 100% rename from mediaprovider.h rename to src/mediaprovider.h diff --git a/mediaproviderids.h b/src/mediaproviderids.h similarity index 100% rename from mediaproviderids.h rename to src/mediaproviderids.h diff --git a/message.cc b/src/message.cc similarity index 100% rename from message.cc rename to src/message.cc diff --git a/message.h b/src/message.h similarity index 100% rename from message.h rename to src/message.h diff --git a/messagequeue.cc b/src/messagequeue.cc similarity index 100% rename from messagequeue.cc rename to src/messagequeue.cc diff --git a/messagequeue.h b/src/messagequeue.h similarity index 100% rename from messagequeue.h rename to src/messagequeue.h diff --git a/movieinfo.cc b/src/movieinfo.cc similarity index 100% rename from movieinfo.cc rename to src/movieinfo.cc diff --git a/movieinfo.h b/src/movieinfo.h similarity index 100% rename from movieinfo.h rename to src/movieinfo.h diff --git a/objects.mk b/src/objects.mk similarity index 100% rename from objects.mk rename to src/objects.mk diff --git a/omx/omx.cc b/src/omx/omx.cc similarity index 100% rename from omx/omx.cc rename to src/omx/omx.cc diff --git a/omx/omx.h b/src/omx/omx.h similarity index 100% rename from omx/omx.h rename to src/omx/omx.h diff --git a/omx/omxeglrender.cc b/src/omx/omxeglrender.cc similarity index 100% rename from omx/omxeglrender.cc rename to src/omx/omxeglrender.cc diff --git a/omx/omxeglrender.h b/src/omx/omxeglrender.h similarity index 100% rename from omx/omxeglrender.h rename to src/omx/omxeglrender.h diff --git a/omx/omximagedecode.cc b/src/omx/omximagedecode.cc similarity index 100% rename from omx/omximagedecode.cc rename to src/omx/omximagedecode.cc diff --git a/omx/omximagedecode.h b/src/omx/omximagedecode.h similarity index 100% rename from omx/omximagedecode.h rename to src/omx/omximagedecode.h diff --git a/option.cc b/src/option.cc similarity index 100% rename from option.cc rename to src/option.cc diff --git a/option.h b/src/option.h similarity index 100% rename from option.h rename to src/option.h diff --git a/osd.cc b/src/osd.cc similarity index 100% rename from osd.cc rename to src/osd.cc diff --git a/osd.h b/src/osd.h similarity index 100% rename from osd.h rename to src/osd.h diff --git a/osddirectfb.cc b/src/osddirectfb.cc similarity index 100% rename from osddirectfb.cc rename to src/osddirectfb.cc diff --git a/osddirectfb.h b/src/osddirectfb.h similarity index 100% rename from osddirectfb.h rename to src/osddirectfb.h diff --git a/osdopengl.cc b/src/osdopengl.cc similarity index 100% rename from osdopengl.cc rename to src/osdopengl.cc diff --git a/osdopengl.h b/src/osdopengl.h similarity index 100% rename from osdopengl.h rename to src/osdopengl.h diff --git a/osdopenvg.cc b/src/osdopenvg.cc similarity index 100% rename from osdopenvg.cc rename to src/osdopenvg.cc diff --git a/osdopenvg.h b/src/osdopenvg.h similarity index 100% rename from osdopenvg.h rename to src/osdopenvg.h diff --git a/osdreceiver.h b/src/osdreceiver.h similarity index 100% rename from osdreceiver.h rename to src/osdreceiver.h diff --git a/osdvector.cc b/src/osdvector.cc similarity index 100% rename from osdvector.cc rename to src/osdvector.cc diff --git a/osdvector.h b/src/osdvector.h similarity index 100% rename from osdvector.h rename to src/osdvector.h diff --git a/osdvectortypes.h b/src/osdvectortypes.h similarity index 100% rename from osdvectortypes.h rename to src/osdvectortypes.h diff --git a/osdwinpixel.cc b/src/osdwinpixel.cc similarity index 100% rename from osdwinpixel.cc rename to src/osdwinpixel.cc diff --git a/osdwinpixel.h b/src/osdwinpixel.h similarity index 100% rename from osdwinpixel.h rename to src/osdwinpixel.h diff --git a/osdwinvector.cc b/src/osdwinvector.cc similarity index 100% rename from osdwinvector.cc rename to src/osdwinvector.cc diff --git a/osdwinvector.h b/src/osdwinvector.h similarity index 100% rename from osdwinvector.h rename to src/osdwinvector.h diff --git a/other/defposter.png b/src/other/defposter.png similarity index 100% rename from other/defposter.png rename to src/other/defposter.png diff --git a/other/dolbyoff.png b/src/other/dolbyoff.png similarity index 100% rename from other/dolbyoff.png rename to src/other/dolbyoff.png diff --git a/other/dolbyon.png b/src/other/dolbyon.png similarity index 100% rename from other/dolbyon.png rename to src/other/dolbyon.png diff --git a/other/hd1080i.png b/src/other/hd1080i.png similarity index 100% rename from other/hd1080i.png rename to src/other/hd1080i.png diff --git a/other/hd720p.png b/src/other/hd720p.png similarity index 100% rename from other/hd720p.png rename to src/other/hd720p.png diff --git a/other/licence.txt b/src/other/licence.txt similarity index 100% rename from other/licence.txt rename to src/other/licence.txt diff --git a/other/properties.png b/src/other/properties.png similarity index 100% rename from other/properties.png rename to src/other/properties.png diff --git a/other/radio.png b/src/other/radio.png similarity index 100% rename from other/radio.png rename to src/other/radio.png diff --git a/other/recfolder.png b/src/other/recfolder.png similarity index 100% rename from other/recfolder.png rename to src/other/recfolder.png diff --git a/other/recording.png b/src/other/recording.png similarity index 100% rename from other/recording.png rename to src/other/recording.png diff --git a/other/recordings.png b/src/other/recordings.png similarity index 100% rename from other/recordings.png rename to src/other/recordings.png diff --git a/other/restart.png b/src/other/restart.png similarity index 100% rename from other/restart.png rename to src/other/restart.png diff --git a/other/sd576i.png b/src/other/sd576i.png similarity index 100% rename from other/sd576i.png rename to src/other/sd576i.png diff --git a/other/timers.png b/src/other/timers.png similarity index 100% rename from other/timers.png rename to src/other/timers.png diff --git a/other/tv.png b/src/other/tv.png similarity index 100% rename from other/tv.png rename to src/other/tv.png diff --git a/other/txtoff.png b/src/other/txtoff.png similarity index 100% rename from other/txtoff.png rename to src/other/txtoff.png diff --git a/other/txton.png b/src/other/txton.png similarity index 100% rename from other/txton.png rename to src/other/txton.png diff --git a/other/vdr.jpg b/src/other/vdr.jpg similarity index 100% rename from other/vdr.jpg rename to src/other/vdr.jpg diff --git a/other/vdrhires.jpg b/src/other/vdrhires.jpg similarity index 100% rename from other/vdrhires.jpg rename to src/other/vdrhires.jpg diff --git a/other/vdrhires.png b/src/other/vdrhires.png similarity index 100% rename from other/vdrhires.png rename to src/other/vdrhires.png diff --git a/other/wallpaper720p.jpg b/src/other/wallpaper720p.jpg similarity index 100% rename from other/wallpaper720p.jpg rename to src/other/wallpaper720p.jpg diff --git a/other/wallpaperNTSC.jpg b/src/other/wallpaperNTSC.jpg similarity index 100% rename from other/wallpaperNTSC.jpg rename to src/other/wallpaperNTSC.jpg diff --git a/other/wallpaperPAL.jpg b/src/other/wallpaperPAL.jpg similarity index 100% rename from other/wallpaperPAL.jpg rename to src/other/wallpaperPAL.jpg diff --git a/playerlive.h b/src/playerlive.h similarity index 100% rename from playerlive.h rename to src/playerlive.h diff --git a/playermedia.cc b/src/playermedia.cc similarity index 100% rename from playermedia.cc rename to src/playermedia.cc diff --git a/playermedia.h b/src/playermedia.h similarity index 100% rename from playermedia.h rename to src/playermedia.h diff --git a/playerradiolive.cc b/src/playerradiolive.cc similarity index 100% rename from playerradiolive.cc rename to src/playerradiolive.cc diff --git a/playerradiolive.h b/src/playerradiolive.h similarity index 100% rename from playerradiolive.h rename to src/playerradiolive.h diff --git a/playerradiorec.cc b/src/playerradiorec.cc similarity index 100% rename from playerradiorec.cc rename to src/playerradiorec.cc diff --git a/playerradiorec.h b/src/playerradiorec.h similarity index 100% rename from playerradiorec.h rename to src/playerradiorec.h diff --git a/playervideolive.cc b/src/playervideolive.cc similarity index 100% rename from playervideolive.cc rename to src/playervideolive.cc diff --git a/playervideolive.h b/src/playervideolive.h similarity index 100% rename from playervideolive.h rename to src/playervideolive.h diff --git a/playervideorec.cc b/src/playervideorec.cc similarity index 100% rename from playervideorec.cc rename to src/playervideorec.cc diff --git a/playervideorec.h b/src/playervideorec.h similarity index 100% rename from playervideorec.h rename to src/playervideorec.h diff --git a/raspi-patches/fetch_libav.sh b/src/raspi-patches/fetch_libav.sh similarity index 100% rename from raspi-patches/fetch_libav.sh rename to src/raspi-patches/fetch_libav.sh diff --git a/raspi-patches/libav_transcode.patch b/src/raspi-patches/libav_transcode.patch similarity index 100% rename from raspi-patches/libav_transcode.patch rename to src/raspi-patches/libav_transcode.patch diff --git a/raspi-patches/readme.txt b/src/raspi-patches/readme.txt similarity index 100% rename from raspi-patches/readme.txt rename to src/raspi-patches/readme.txt diff --git a/recinfo.cc b/src/recinfo.cc similarity index 100% rename from recinfo.cc rename to src/recinfo.cc diff --git a/recinfo.h b/src/recinfo.h similarity index 100% rename from recinfo.h rename to src/recinfo.h diff --git a/recman.cc b/src/recman.cc similarity index 100% rename from recman.cc rename to src/recman.cc diff --git a/recman.h b/src/recman.h similarity index 100% rename from recman.h rename to src/recman.h diff --git a/recording.cc b/src/recording.cc similarity index 100% rename from recording.cc rename to src/recording.cc diff --git a/recording.h b/src/recording.h similarity index 100% rename from recording.h rename to src/recording.h diff --git a/rectimer.cc b/src/rectimer.cc similarity index 100% rename from rectimer.cc rename to src/rectimer.cc diff --git a/rectimer.h b/src/rectimer.h similarity index 100% rename from rectimer.h rename to src/rectimer.h diff --git a/region.cc b/src/region.cc similarity index 100% rename from region.cc rename to src/region.cc diff --git a/region.h b/src/region.h similarity index 100% rename from region.h rename to src/region.h diff --git a/serialize.cc b/src/serialize.cc similarity index 100% rename from serialize.cc rename to src/serialize.cc diff --git a/serialize.h b/src/serialize.h similarity index 100% rename from serialize.h rename to src/serialize.h diff --git a/seriesinfo.cc b/src/seriesinfo.cc similarity index 100% rename from seriesinfo.cc rename to src/seriesinfo.cc diff --git a/seriesinfo.h b/src/seriesinfo.h similarity index 100% rename from seriesinfo.h rename to src/seriesinfo.h diff --git a/sleeptimer.cc b/src/sleeptimer.cc similarity index 100% rename from sleeptimer.cc rename to src/sleeptimer.cc diff --git a/sleeptimer.h b/src/sleeptimer.h similarity index 100% rename from sleeptimer.h rename to src/sleeptimer.h diff --git a/staticartwork.h b/src/staticartwork.h similarity index 100% rename from staticartwork.h rename to src/staticartwork.h diff --git a/stream.cc b/src/stream.cc similarity index 100% rename from stream.cc rename to src/stream.cc diff --git a/stream.h b/src/stream.h similarity index 100% rename from stream.h rename to src/stream.h diff --git a/surface.cc b/src/surface.cc similarity index 100% rename from surface.cc rename to src/surface.cc diff --git a/surface.h b/src/surface.h similarity index 100% rename from surface.h rename to src/surface.h diff --git a/surfacedirectfb.cc b/src/surfacedirectfb.cc similarity index 100% rename from surfacedirectfb.cc rename to src/surfacedirectfb.cc diff --git a/surfacedirectfb.h b/src/surfacedirectfb.h similarity index 100% rename from surfacedirectfb.h rename to src/surfacedirectfb.h diff --git a/surfaceopengl.cc b/src/surfaceopengl.cc similarity index 100% rename from surfaceopengl.cc rename to src/surfaceopengl.cc diff --git a/surfaceopengl.h b/src/surfaceopengl.h similarity index 100% rename from surfaceopengl.h rename to src/surfaceopengl.h diff --git a/surfacevector.cc b/src/surfacevector.cc similarity index 100% rename from surfacevector.cc rename to src/surfacevector.cc diff --git a/surfacevector.h b/src/surfacevector.h similarity index 100% rename from surfacevector.h rename to src/surfacevector.h diff --git a/surfacewin.cc b/src/surfacewin.cc similarity index 100% rename from surfacewin.cc rename to src/surfacewin.cc diff --git a/surfacewin.h b/src/surfacewin.h similarity index 100% rename from surfacewin.h rename to src/surfacewin.h diff --git a/tbboxx.cc b/src/tbboxx.cc similarity index 100% rename from tbboxx.cc rename to src/tbboxx.cc diff --git a/tbboxx.h b/src/tbboxx.h similarity index 100% rename from tbboxx.h rename to src/tbboxx.h diff --git a/tcp.cc b/src/tcp.cc similarity index 100% rename from tcp.cc rename to src/tcp.cc diff --git a/tcp.h b/src/tcp.h similarity index 100% rename from tcp.h rename to src/tcp.h diff --git a/teletextdecodervbiebu.cc b/src/teletextdecodervbiebu.cc similarity index 100% rename from teletextdecodervbiebu.cc rename to src/teletextdecodervbiebu.cc diff --git a/teletextdecodervbiebu.h b/src/teletextdecodervbiebu.h similarity index 100% rename from teletextdecodervbiebu.h rename to src/teletextdecodervbiebu.h diff --git a/teletxt/COPYING b/src/teletxt/COPYING similarity index 100% rename from teletxt/COPYING rename to src/teletxt/COPYING diff --git a/teletxt/README b/src/teletxt/README similarity index 100% rename from teletxt/README rename to src/teletxt/README diff --git a/teletxt/tables.h b/src/teletxt/tables.h similarity index 100% rename from teletxt/tables.h rename to src/teletxt/tables.h diff --git a/teletxt/txtfont.cc b/src/teletxt/txtfont.cc similarity index 100% rename from teletxt/txtfont.cc rename to src/teletxt/txtfont.cc diff --git a/teletxt/txtfont.h b/src/teletxt/txtfont.h similarity index 100% rename from teletxt/txtfont.h rename to src/teletxt/txtfont.h diff --git a/tfeed.cc b/src/tfeed.cc similarity index 100% rename from tfeed.cc rename to src/tfeed.cc diff --git a/tfeed.h b/src/tfeed.h similarity index 100% rename from tfeed.h rename to src/tfeed.h diff --git a/thread.cc b/src/thread.cc similarity index 100% rename from thread.cc rename to src/thread.cc diff --git a/thread.h b/src/thread.h similarity index 100% rename from thread.h rename to src/thread.h diff --git a/threadp.cc b/src/threadp.cc similarity index 100% rename from threadp.cc rename to src/threadp.cc diff --git a/threadp.h b/src/threadp.h similarity index 100% rename from threadp.h rename to src/threadp.h diff --git a/threadpandroid.cc b/src/threadpandroid.cc similarity index 100% rename from threadpandroid.cc rename to src/threadpandroid.cc diff --git a/threadpandroid.h b/src/threadpandroid.h similarity index 100% rename from threadpandroid.h rename to src/threadpandroid.h diff --git a/threadsystem.h b/src/threadsystem.h similarity index 100% rename from threadsystem.h rename to src/threadsystem.h diff --git a/threadwin.cc b/src/threadwin.cc similarity index 100% rename from threadwin.cc rename to src/threadwin.cc diff --git a/threadwin.h b/src/threadwin.h similarity index 100% rename from threadwin.h rename to src/threadwin.h diff --git a/timerreceiver.h b/src/timerreceiver.h similarity index 100% rename from timerreceiver.h rename to src/timerreceiver.h diff --git a/timers.cc b/src/timers.cc similarity index 100% rename from timers.cc rename to src/timers.cc diff --git a/timers.h b/src/timers.h similarity index 100% rename from timers.h rename to src/timers.h diff --git a/udp4.cc b/src/udp4.cc similarity index 100% rename from udp4.cc rename to src/udp4.cc diff --git a/udp4.h b/src/udp4.h similarity index 100% rename from udp4.h rename to src/udp4.h diff --git a/udp6.cc b/src/udp6.cc similarity index 100% rename from udp6.cc rename to src/udp6.cc diff --git a/udp6.h b/src/udp6.h similarity index 100% rename from udp6.h rename to src/udp6.h diff --git a/util.cc b/src/util.cc similarity index 100% rename from util.cc rename to src/util.cc diff --git a/util.h b/src/util.h similarity index 100% rename from util.h rename to src/util.h diff --git a/vaudioselector.cc b/src/vaudioselector.cc similarity index 100% rename from vaudioselector.cc rename to src/vaudioselector.cc diff --git a/vaudioselector.h b/src/vaudioselector.h similarity index 100% rename from vaudioselector.h rename to src/vaudioselector.h diff --git a/vchannellist.cc b/src/vchannellist.cc similarity index 100% rename from vchannellist.cc rename to src/vchannellist.cc diff --git a/vchannellist.h b/src/vchannellist.h similarity index 100% rename from vchannellist.h rename to src/vchannellist.h diff --git a/vchannelselect.cc b/src/vchannelselect.cc similarity index 100% rename from vchannelselect.cc rename to src/vchannelselect.cc diff --git a/vchannelselect.h b/src/vchannelselect.h similarity index 100% rename from vchannelselect.h rename to src/vchannelselect.h diff --git a/vcolourtuner.cc b/src/vcolourtuner.cc similarity index 100% rename from vcolourtuner.cc rename to src/vcolourtuner.cc diff --git a/vcolourtuner.h b/src/vcolourtuner.h similarity index 100% rename from vcolourtuner.h rename to src/vcolourtuner.h diff --git a/vconnect.cc b/src/vconnect.cc similarity index 100% rename from vconnect.cc rename to src/vconnect.cc diff --git a/vconnect.h b/src/vconnect.h similarity index 100% rename from vconnect.h rename to src/vconnect.h diff --git a/vdpc.cc b/src/vdpc.cc similarity index 100% rename from vdpc.cc rename to src/vdpc.cc diff --git a/vdpc.h b/src/vdpc.h similarity index 100% rename from vdpc.h rename to src/vdpc.h diff --git a/vdr.cc b/src/vdr.cc similarity index 100% rename from vdr.cc rename to src/vdr.cc diff --git a/vdr.h b/src/vdr.h similarity index 100% rename from vdr.h rename to src/vdr.h diff --git a/vdrcommand.h b/src/vdrcommand.h similarity index 100% rename from vdrcommand.h rename to src/vdrcommand.h diff --git a/vdrrequestpacket.cc b/src/vdrrequestpacket.cc similarity index 100% rename from vdrrequestpacket.cc rename to src/vdrrequestpacket.cc diff --git a/vdrrequestpacket.h b/src/vdrrequestpacket.h similarity index 100% rename from vdrrequestpacket.h rename to src/vdrrequestpacket.h diff --git a/vdrresponsepacket.cc b/src/vdrresponsepacket.cc similarity index 100% rename from vdrresponsepacket.cc rename to src/vdrresponsepacket.cc diff --git a/vdrresponsepacket.h b/src/vdrresponsepacket.h similarity index 100% rename from vdrresponsepacket.h rename to src/vdrresponsepacket.h diff --git a/vepg.cc b/src/vepg.cc similarity index 100% rename from vepg.cc rename to src/vepg.cc diff --git a/vepg.h b/src/vepg.h similarity index 100% rename from vepg.h rename to src/vepg.h diff --git a/vepglistadvanced.cc b/src/vepglistadvanced.cc similarity index 100% rename from vepglistadvanced.cc rename to src/vepglistadvanced.cc diff --git a/vepglistadvanced.h b/src/vepglistadvanced.h similarity index 100% rename from vepglistadvanced.h rename to src/vepglistadvanced.h diff --git a/vepgsettimer.cc b/src/vepgsettimer.cc similarity index 100% rename from vepgsettimer.cc rename to src/vepgsettimer.cc diff --git a/vepgsettimer.h b/src/vepgsettimer.h similarity index 100% rename from vepgsettimer.h rename to src/vepgsettimer.h diff --git a/vepgsummary.cc b/src/vepgsummary.cc similarity index 100% rename from vepgsummary.cc rename to src/vepgsummary.cc diff --git a/vepgsummary.h b/src/vepgsummary.h similarity index 100% rename from vepgsummary.h rename to src/vepgsummary.h diff --git a/vfeed.cc b/src/vfeed.cc similarity index 100% rename from vfeed.cc rename to src/vfeed.cc diff --git a/vfeed.h b/src/vfeed.h similarity index 100% rename from vfeed.h rename to src/vfeed.h diff --git a/video.cc b/src/video.cc similarity index 100% rename from video.cc rename to src/video.cc diff --git a/video.h b/src/video.h similarity index 100% rename from video.h rename to src/video.h diff --git a/videoomx.cc b/src/videoomx.cc similarity index 100% rename from videoomx.cc rename to src/videoomx.cc diff --git a/videoomx.h b/src/videoomx.h similarity index 100% rename from videoomx.h rename to src/videoomx.h diff --git a/videowin.cc b/src/videowin.cc similarity index 100% rename from videowin.cc rename to src/videowin.cc diff --git a/videowin.h b/src/videowin.h similarity index 100% rename from videowin.h rename to src/videowin.h diff --git a/vinfo.cc b/src/vinfo.cc similarity index 100% rename from vinfo.cc rename to src/vinfo.cc diff --git a/vinfo.h b/src/vinfo.h similarity index 100% rename from vinfo.h rename to src/vinfo.h diff --git a/vmedialist.cc b/src/vmedialist.cc similarity index 100% rename from vmedialist.cc rename to src/vmedialist.cc diff --git a/vmedialist.h b/src/vmedialist.h similarity index 100% rename from vmedialist.h rename to src/vmedialist.h diff --git a/vmediaview.cc b/src/vmediaview.cc similarity index 100% rename from vmediaview.cc rename to src/vmediaview.cc diff --git a/vmediaview.h b/src/vmediaview.h similarity index 100% rename from vmediaview.h rename to src/vmediaview.h diff --git a/vmute.cc b/src/vmute.cc similarity index 100% rename from vmute.cc rename to src/vmute.cc diff --git a/vmute.h b/src/vmute.h similarity index 100% rename from vmute.h rename to src/vmute.h diff --git a/vompreswin.h b/src/vompreswin.h similarity index 100% rename from vompreswin.h rename to src/vompreswin.h diff --git a/vompwin.rc b/src/vompwin.rc similarity index 100% rename from vompwin.rc rename to src/vompwin.rc diff --git a/vopts.cc b/src/vopts.cc similarity index 100% rename from vopts.cc rename to src/vopts.cc diff --git a/vopts.h b/src/vopts.h similarity index 100% rename from vopts.h rename to src/vopts.h diff --git a/vpicturebanner.cc b/src/vpicturebanner.cc similarity index 100% rename from vpicturebanner.cc rename to src/vpicturebanner.cc diff --git a/vpicturebanner.h b/src/vpicturebanner.h similarity index 100% rename from vpicturebanner.h rename to src/vpicturebanner.h diff --git a/vquestion.cc b/src/vquestion.cc similarity index 100% rename from vquestion.cc rename to src/vquestion.cc diff --git a/vquestion.h b/src/vquestion.h similarity index 100% rename from vquestion.h rename to src/vquestion.h diff --git a/vradiorec.cc b/src/vradiorec.cc similarity index 100% rename from vradiorec.cc rename to src/vradiorec.cc diff --git a/vradiorec.h b/src/vradiorec.h similarity index 100% rename from vradiorec.h rename to src/vradiorec.h diff --git a/vrecmove.cc b/src/vrecmove.cc similarity index 100% rename from vrecmove.cc rename to src/vrecmove.cc diff --git a/vrecmove.h b/src/vrecmove.h similarity index 100% rename from vrecmove.h rename to src/vrecmove.h diff --git a/vrecording.cc b/src/vrecording.cc similarity index 100% rename from vrecording.cc rename to src/vrecording.cc diff --git a/vrecording.h b/src/vrecording.h similarity index 100% rename from vrecording.h rename to src/vrecording.h diff --git a/vrecordinglist.cc b/src/vrecordinglist.cc similarity index 100% rename from vrecordinglist.cc rename to src/vrecordinglist.cc diff --git a/vrecordinglist.h b/src/vrecordinglist.h similarity index 100% rename from vrecordinglist.h rename to src/vrecordinglist.h diff --git a/vrecordinglistadvanced.cc b/src/vrecordinglistadvanced.cc similarity index 100% rename from vrecordinglistadvanced.cc rename to src/vrecordinglistadvanced.cc diff --git a/vrecordinglistadvanced.h b/src/vrecordinglistadvanced.h similarity index 100% rename from vrecordinglistadvanced.h rename to src/vrecordinglistadvanced.h diff --git a/vrecordinglistclassic.cc b/src/vrecordinglistclassic.cc similarity index 100% rename from vrecordinglistclassic.cc rename to src/vrecordinglistclassic.cc diff --git a/vrecordinglistclassic.h b/src/vrecordinglistclassic.h similarity index 100% rename from vrecordinglistclassic.h rename to src/vrecordinglistclassic.h diff --git a/vrecordingmenu.cc b/src/vrecordingmenu.cc similarity index 100% rename from vrecordingmenu.cc rename to src/vrecordingmenu.cc diff --git a/vrecordingmenu.h b/src/vrecordingmenu.h similarity index 100% rename from vrecordingmenu.h rename to src/vrecordingmenu.h diff --git a/vscreensaver.cc b/src/vscreensaver.cc similarity index 100% rename from vscreensaver.cc rename to src/vscreensaver.cc diff --git a/vscreensaver.h b/src/vscreensaver.h similarity index 100% rename from vscreensaver.h rename to src/vscreensaver.h diff --git a/vserverselect.cc b/src/vserverselect.cc similarity index 100% rename from vserverselect.cc rename to src/vserverselect.cc diff --git a/vserverselect.h b/src/vserverselect.h similarity index 100% rename from vserverselect.h rename to src/vserverselect.h diff --git a/vteletextview.cc b/src/vteletextview.cc similarity index 100% rename from vteletextview.cc rename to src/vteletextview.cc diff --git a/vteletextview.h b/src/vteletextview.h similarity index 100% rename from vteletextview.h rename to src/vteletextview.h diff --git a/vtimeredit.cc b/src/vtimeredit.cc similarity index 100% rename from vtimeredit.cc rename to src/vtimeredit.cc diff --git a/vtimeredit.h b/src/vtimeredit.h similarity index 100% rename from vtimeredit.h rename to src/vtimeredit.h diff --git a/vtimerlist.cc b/src/vtimerlist.cc similarity index 100% rename from vtimerlist.cc rename to src/vtimerlist.cc diff --git a/vtimerlist.h b/src/vtimerlist.h similarity index 100% rename from vtimerlist.h rename to src/vtimerlist.h diff --git a/vvideolivetv.cc b/src/vvideolivetv.cc similarity index 100% rename from vvideolivetv.cc rename to src/vvideolivetv.cc diff --git a/vvideolivetv.h b/src/vvideolivetv.h similarity index 100% rename from vvideolivetv.h rename to src/vvideolivetv.h diff --git a/vvideomedia.cc b/src/vvideomedia.cc similarity index 100% rename from vvideomedia.cc rename to src/vvideomedia.cc diff --git a/vvideomedia.h b/src/vvideomedia.h similarity index 100% rename from vvideomedia.h rename to src/vvideomedia.h diff --git a/vvideorec.cc b/src/vvideorec.cc similarity index 100% rename from vvideorec.cc rename to src/vvideorec.cc diff --git a/vvideorec.h b/src/vvideorec.h similarity index 100% rename from vvideorec.h rename to src/vvideorec.h diff --git a/vvolume.cc b/src/vvolume.cc similarity index 100% rename from vvolume.cc rename to src/vvolume.cc diff --git a/vvolume.h b/src/vvolume.h similarity index 100% rename from vvolume.h rename to src/vvolume.h diff --git a/vwelcome.cc b/src/vwelcome.cc similarity index 100% rename from vwelcome.cc rename to src/vwelcome.cc diff --git a/vwelcome.h b/src/vwelcome.h similarity index 100% rename from vwelcome.h rename to src/vwelcome.h diff --git a/wbutton.cc b/src/wbutton.cc similarity index 100% rename from wbutton.cc rename to src/wbutton.cc diff --git a/wbutton.h b/src/wbutton.h similarity index 100% rename from wbutton.h rename to src/wbutton.h diff --git a/windowsosd.cc b/src/windowsosd.cc similarity index 100% rename from windowsosd.cc rename to src/windowsosd.cc diff --git a/windowsosd.h b/src/windowsosd.h similarity index 100% rename from windowsosd.h rename to src/windowsosd.h diff --git a/winmain.cc b/src/winmain.cc similarity index 100% rename from winmain.cc rename to src/winmain.cc diff --git a/wjpeg.cc b/src/wjpeg.cc similarity index 100% rename from wjpeg.cc rename to src/wjpeg.cc diff --git a/wjpeg.h b/src/wjpeg.h similarity index 100% rename from wjpeg.h rename to src/wjpeg.h diff --git a/wjpegcomplex.cc b/src/wjpegcomplex.cc similarity index 100% rename from wjpegcomplex.cc rename to src/wjpegcomplex.cc diff --git a/wjpegcomplex.h b/src/wjpegcomplex.h similarity index 100% rename from wjpegcomplex.h rename to src/wjpegcomplex.h diff --git a/wjpegsimple.cc b/src/wjpegsimple.cc similarity index 100% rename from wjpegsimple.cc rename to src/wjpegsimple.cc diff --git a/wjpegsimple.h b/src/wjpegsimple.h similarity index 100% rename from wjpegsimple.h rename to src/wjpegsimple.h diff --git a/wmovieview.cc b/src/wmovieview.cc similarity index 100% rename from wmovieview.cc rename to src/wmovieview.cc diff --git a/wmovieview.h b/src/wmovieview.h similarity index 100% rename from wmovieview.h rename to src/wmovieview.h diff --git a/wol.cc b/src/wol.cc similarity index 100% rename from wol.cc rename to src/wol.cc diff --git a/wol.h b/src/wol.h similarity index 100% rename from wol.h rename to src/wol.h diff --git a/woptionbox.cc b/src/woptionbox.cc similarity index 100% rename from woptionbox.cc rename to src/woptionbox.cc diff --git a/woptionbox.h b/src/woptionbox.h similarity index 100% rename from woptionbox.h rename to src/woptionbox.h diff --git a/woptionpane.cc b/src/woptionpane.cc similarity index 100% rename from woptionpane.cc rename to src/woptionpane.cc diff --git a/woptionpane.h b/src/woptionpane.h similarity index 100% rename from woptionpane.h rename to src/woptionpane.h diff --git a/wpictureview.cc b/src/wpictureview.cc similarity index 100% rename from wpictureview.cc rename to src/wpictureview.cc diff --git a/wpictureview.h b/src/wpictureview.h similarity index 100% rename from wpictureview.h rename to src/wpictureview.h diff --git a/wprogressbar.cc b/src/wprogressbar.cc similarity index 100% rename from wprogressbar.cc rename to src/wprogressbar.cc diff --git a/wprogressbar.h b/src/wprogressbar.h similarity index 100% rename from wprogressbar.h rename to src/wprogressbar.h diff --git a/wremoteconfig.cc b/src/wremoteconfig.cc similarity index 100% rename from wremoteconfig.cc rename to src/wremoteconfig.cc diff --git a/wremoteconfig.h b/src/wremoteconfig.h similarity index 100% rename from wremoteconfig.h rename to src/wremoteconfig.h diff --git a/wselectlist.cc b/src/wselectlist.cc similarity index 100% rename from wselectlist.cc rename to src/wselectlist.cc diff --git a/wselectlist.h b/src/wselectlist.h similarity index 100% rename from wselectlist.h rename to src/wselectlist.h diff --git a/wseriesview.cc b/src/wseriesview.cc similarity index 100% rename from wseriesview.cc rename to src/wseriesview.cc diff --git a/wseriesview.h b/src/wseriesview.h similarity index 100% rename from wseriesview.h rename to src/wseriesview.h diff --git a/wsymbol.cc b/src/wsymbol.cc similarity index 100% rename from wsymbol.cc rename to src/wsymbol.cc diff --git a/wsymbol.h b/src/wsymbol.h similarity index 100% rename from wsymbol.h rename to src/wsymbol.h diff --git a/wtabbar.cc b/src/wtabbar.cc similarity index 100% rename from wtabbar.cc rename to src/wtabbar.cc diff --git a/wtabbar.h b/src/wtabbar.h similarity index 100% rename from wtabbar.h rename to src/wtabbar.h diff --git a/wtextbox.cc b/src/wtextbox.cc similarity index 100% rename from wtextbox.cc rename to src/wtextbox.cc diff --git a/wtextbox.h b/src/wtextbox.h similarity index 100% rename from wtextbox.h rename to src/wtextbox.h diff --git a/wtvmedia.cc b/src/wtvmedia.cc similarity index 100% rename from wtvmedia.cc rename to src/wtvmedia.cc diff --git a/wtvmedia.h b/src/wtvmedia.h similarity index 100% rename from wtvmedia.h rename to src/wtvmedia.h diff --git a/wwinaudiofilter.cc b/src/wwinaudiofilter.cc similarity index 100% rename from wwinaudiofilter.cc rename to src/wwinaudiofilter.cc diff --git a/wwinaudiofilter.h b/src/wwinaudiofilter.h similarity index 100% rename from wwinaudiofilter.h rename to src/wwinaudiofilter.h diff --git a/wwinmp3audiofilter.cc b/src/wwinmp3audiofilter.cc similarity index 100% rename from wwinmp3audiofilter.cc rename to src/wwinmp3audiofilter.cc diff --git a/wwinmp3audiofilter.h b/src/wwinmp3audiofilter.h similarity index 100% rename from wwinmp3audiofilter.h rename to src/wwinmp3audiofilter.h diff --git a/wwinvideofilter.cc b/src/wwinvideofilter.cc similarity index 100% rename from wwinvideofilter.cc rename to src/wwinvideofilter.cc diff --git a/wwinvideofilter.h b/src/wwinvideofilter.h similarity index 100% rename from wwinvideofilter.h rename to src/wwinvideofilter.h diff --git a/wwinvideoh264filter.cc b/src/wwinvideoh264filter.cc similarity index 100% rename from wwinvideoh264filter.cc rename to src/wwinvideoh264filter.cc diff --git a/wwinvideoh264filter.h b/src/wwinvideoh264filter.h similarity index 100% rename from wwinvideoh264filter.h rename to src/wwinvideoh264filter.h -- 2.39.5