Make AbstractOption header-only. Disable unused finction in DVBSubs

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63115d7b9f7862c69862edd335a35c753879fb05..5796a17f5dca28fbec45929c10f59a879830a874 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ set (VOMP_OBJ_COMMON
        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
+       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
@@ -25,6 +25,7 @@ set (VOMP_OBJ_COMMON
        playervideorec.cc playervideolive.cc playerradiolive.cc playerradiorec.cc
        imageloader.cc image.cc telem.cc
 )
+# abstractoption.cc
 
 set (VOMP_OBJ_RASPBERRY
        main.cc threadp.cc osdopenvg.cc ledraspberry.cc videoomx.cc audioomx.cc imageomx.cc

diff --git a/src/abstractoption.cc b/src/abstractoption.cc
deleted file mode 100644 (file)
index 6e9d13a..0000000
--- a/src/abstractoption.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Copyright 2007-2008 Marten Richter
-
-    This file is part of VOMP.
-
-    VOMP is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    VOMP is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with VOMP; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-#include "abstractoption.h"
-#include "vdr.h"
-#include "option.h"
-
-/*
-bool AbstractOption::loadOptionsFromServer(VDR* vdr)
-{
-    return true;
-}
-
-bool AbstractOption::saveOptionstoServer()
-{
-    return true;
-}
-
-bool AbstractOption::addOptionPagesToWTB(WTabBar *wtb)
-{
-    return true;
-}
-
-bool AbstractOption::addOptionsToPanes(int panenumber,Options *options,WOptionPane* pane) 
-{
-    return true;
-}
-
-bool AbstractOption::handleOptionChanges(Option* option)
-{
-    return false;
-}*/
-

diff --git a/src/dvbsubtitles.cc b/src/dvbsubtitles.cc
index d03832618ea922dfe89f94a7f3ea994dda0c5d37..ba4adf20d1a91759bbb69b15389f88a85d1456fc 100644 (file)
--- a/src/dvbsubtitles.cc
+++ b/src/dvbsubtitles.cc
@@ -489,6 +489,7 @@ void DVBSubtitleObject::decodeSubBlock(const u1* data, u4 length, bool even)
   }
 }
 
+/*
 static u8 PTSDifference(u8 pts1, u8 pts2)
 {
   // Assume pts1, pts2 < 2^33; calculate pts1 - pts2
@@ -497,6 +498,7 @@ static u8 PTSDifference(u8 pts1, u8 pts2)
   else
     return (1LL<<33) + pts1 - pts2;
 }
+*/
 
 static i8 PTSDifference2(u8 now, u8 next)
 {