Removed the code for automatic video detection. It interfered with video

selection feature of the Java viewer, and did not look good with respect to
the impending polling improvements.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2566 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 1 insertions, 17 deletions

diff --git a/unix/x0vncserver/PollingManager.h b/unix/x0vncserver/PollingManager.h
index 09cd5c3a..cedac1a3 100644
--- a/unix/x0vncserver/PollingManager.h
+++ b/unix/x0vncserver/PollingManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2007 Constantin Kaplinsky.  All Rights Reserved.
+/* Copyright (C) 2004-2008 Constantin Kaplinsky.  All Rights Reserved.
  *    
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,8 +108,6 @@ private:
   int checkRow(int x, int y, int w);
   int checkColumn(int x, int y, int h, bool *pChangeFlags);
   int sendChanges();
-  void handleVideo();
-  void flagVideoArea(bool value);
 
   // Check neighboring tiles and update m_changeFlags[].
   void checkNeighbors();
@@ -117,13 +115,6 @@ private:
   // DEBUG: Print the list of changed tiles.
   void printChanges(const char *header) const;
 
-  // Video detection functions.
-  void detectVideo();
-  void getVideoAreaRect(Rect *result);
-  void constructLengthMatrices(int **pmx_h, int **pmx_v);
-  void destroyLengthMatrices(int *mx_h, int *mx_v);
-  void findMaxLocalRect(Rect *r, int *mx_h, int *mx_v);
-
   // Additional images used in polling algorithms.
   Image *m_rowImage;            // one row of the framebuffer
   Image *m_columnImage;         // one column of the framebuffer
@@ -137,16 +128,9 @@ private:
   // in that tile.
   bool *m_changeFlags;
 
-  char *m_rateMatrix;
-  char *m_videoFlags;
-  Rect m_videoRect;
-  int m_numVideoPasses;
-
   unsigned int m_pollingStep;
   static const int m_pollingOrder[];
 
-  static IntParameter m_videoPriority;
-
 #ifdef DEBUG
 private: