[Kwintv] kdeextragear-3/kdetv

[Dirk Ziegelmeier]

CVS commit by dziegel: 

Overscan. (Plus a few minor other changes I was too lazy to split off).
CCMAIL: kwintv at mail.kde.org
CCMAIL: ossi at kde.org


  A            plugins/filter/overscan/.cvsignore   1.1
  A            plugins/filter/overscan/Makefile.am   1.1
  A            plugins/filter/overscan/kdetv_overscan.desktop   1.1
  A            plugins/filter/overscan/overscan.cpp   1.1 [LGPL (v2+)]
  A            plugins/filter/overscan/overscan.h   1.1 [LGPL (v2+)]
  A            plugins/filter/overscan/overscanui.rc   1.1
  M +4 -2      clients/kdetv/kdetvui.rc   1.30
  M +8 -0      libkdetv/vbimanager.cpp   1.12
  M +1 -1      plugins/filter/Makefile.am   1.4
  M +11 -6     plugins/filter/greedy2frame/greedy2frame_inc.cpp   1.2
  M +2 -10     plugins/filter/greedy2frame/kdetv_greedy2frame.desktop   1.3
  M +1 -1      plugins/vbi/libzvbidecoder/vbidecoder.cpp   1.19


--- kdeextragear-3/kdetv/clients/kdetv/kdetvui.rc  #1.29:1.30
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kdetv" version="10">
+<kpartgui name="kdetv" version="11">
   <MenuBar>
     <Menu name="file"><text>&amp;kdetv</text>
@@ -23,4 +23,7 @@
       <ActionList name="audiomode_actionlist" />
     </Menu>
+    <Menu name="picture"><text>&amp;Picture</text>
+      <Action name="picture_settings"/>
+    </Menu>
     <Menu name="devices"><text>&amp;Devices</text>
       <ActionList name="devices_actionlist" />
@@ -38,5 +41,4 @@
       <Action name="config_toolbars" append="configure_merge"/>
       <Separator/>
-      <Action name="picture_settings"/>
       <Action name="channel_editor"/>
     </Menu>

--- kdeextragear-3/kdetv/libkdetv/vbimanager.cpp  #1.11:1.12
@@ -77,4 +77,12 @@ void VbiManager::addClient()
                 scanPlugins();
         }
+
+    if(_plugin) {
+        if(_suspendCount > 0) {
+            _plugin->resume();
+        } else {
+            _plugin->suspend();
+        }
+    }
 }
 

--- kdeextragear-3/kdetv/plugins/filter/Makefile.am  #1.3:1.4
@@ -1,3 +1,3 @@
-SUBDIRS=linearblend bilinear
+SUBDIRS=linearblend bilinear overscan
 # greedy2frame
 

--- kdeextragear-3/kdetv/plugins/filter/greedy2frame/greedy2frame_inc.cpp  #1.1:1.2
@@ -19,4 +19,9 @@
 //
 // $Log$
+// Revision 1.2  2004/06/24 15:22:49  dziegel
+// Overscan. (Plus a few minor other changes I was too lazy to split off).
+// CCMAIL: kwintv at mail.kde.org
+// CCMAIL: ossi at kde.org
+//
 // Revision 1.1  2004/06/22 19:46:41  dziegel
 // Vbidecoder suspend/resume patch from Andras Mantia
@@ -75,6 +80,6 @@ void Greedy2FrameImageFilter::deinterlac
     static unsigned char* Dest2;
     unsigned int Pitch = 0;
-    static unsigned int LineLength = ctx->out->bytesPerLine();
-    unsigned int FieldHeight = ctx->out->size().height() >> 1;
+    static unsigned int LineLength = ctx->images[0]->bytesPerLine();
+    unsigned int FieldHeight = ctx->images[0]->size().height() >> 1;
     unsigned int OverlayPitch = 0;
 

--- kdeextragear-3/kdetv/plugins/filter/greedy2frame/kdetv_greedy2frame.desktop  #1.2:1.3
@@ -7,14 +7,6 @@
 X-Kdetv-Plugin-Library=greedy2frame
 X-Kdetv-Plugin-Factory=greedy2frame
-Name=Greedy2Frame Deinterlacing from DScaler
-Name[et]=DScaleri Greedy2Frame kihilisuse eemaldamine
-Name[pt]=Desinterlaçamento Greedy2Frame de DScaler
-Name[pt_BR]=Desinterlaçamento Greedy2Frame de DScaler
-Name[sv]=Glupsk tvårutors borttagning av inflätning från Dscaler
-Comment=Higher CPU usage, good quality
-Comment[et]=Kõrgem protsessori kasutus, hea kvaliteet
-Comment[pt]=Alta utilização de CPU, qualidade boa
-Comment[pt_BR]=Alta utilização de CPU, qualidade boa
-Comment[sv]=Högre processoranvändning, bra kvalitet
+Name=Greedy2Frame Deinterlacing
+Comment=Higher CPU usage, good quality (adapted from DScaler www.dscaler.org)
 X-Kdetv-Plugin-Author=Dirk Ziegelmeier
 X-Kdetv-Configurable=false

--- kdeextragear-3/kdetv/plugins/vbi/libzvbidecoder/vbidecoder.cpp  #1.18:1.19
@@ -145,5 +145,5 @@ private:
 VbiDecoderPrivate::VbiDecoderPrivate(QObject* eventTarget)
     : QThread(),
-      _suspended(true),
+      _suspended(false),
       _terminate(false),
       _cap(0L),