[ekiga] Remove unused function
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Remove unused function
- Date: Mon, 4 Aug 2014 09:30:30 +0000 (UTC)
commit 9942b6d401f01a87326e0bb266a4989aa944bb04
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Mon Aug 4 11:30:03 2014 +0200
Remove unused function
lib/engine/components/opal/opal-videoinput.cpp | 31 +++-----------
lib/engine/components/opal/opal-videoinput.h | 51 ++++++++++-------------
2 files changed, 29 insertions(+), 53 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-videoinput.cpp b/lib/engine/components/opal/opal-videoinput.cpp
index 685c502..88a8137 100644
--- a/lib/engine/components/opal/opal-videoinput.cpp
+++ b/lib/engine/components/opal/opal-videoinput.cpp
@@ -31,7 +31,7 @@
* --------------------------------
* begin : Mon Feb 12 2001
* copyright : (C) 2000-2006 by Damien Sandras
- * description : Video4Linux compliant functions to manipulate the
+ * description : Video4Linux compliant functions to manipulate the
* webcam device.
*
*/
@@ -94,7 +94,7 @@ PVideoInputDevice_EKIGA::Close ()
return true;
}
-
+
bool
PVideoInputDevice_EKIGA::Start ()
{
@@ -110,7 +110,7 @@ PVideoInputDevice_EKIGA::Start ()
return true;
}
-
+
bool
PVideoInputDevice_EKIGA::Stop ()
{
@@ -153,7 +153,7 @@ PVideoInputDevice_EKIGA::GetFrameData (BYTE *frame,
videoinput_core->get_frame_data((char*)frame);
*i = frameWidth * frameHeight * 3 / 2;
-
+
return true;
}
@@ -206,10 +206,10 @@ PVideoInputDevice_EKIGA::SetChannel (int /*newChannel*/)
bool
PVideoInputDevice_EKIGA::SetColourFormat (const PString &newFormat)
{
- if (newFormat == "YUV420P")
+ if (newFormat == "YUV420P")
return PVideoDevice::SetColourFormat (newFormat);
- return false;
+ return false;
}
@@ -217,7 +217,7 @@ bool
PVideoInputDevice_EKIGA::SetFrameRate (unsigned rate)
{
PVideoDevice::SetFrameRate (rate);
-
+
return true;
}
@@ -235,20 +235,3 @@ PVideoInputDevice_EKIGA::GetFrameSizeLimits (unsigned & minWidth,
return true;
}
-
-/*
-bool PVideoInputDevice_EKIGA::GetParameters (int *whiteness,
- int *brightness,
- int *colour,
- int *contrast,
- int *hue)
-{
- *whiteness = 0;
- *brightness = 0;
- *colour = 0;
- *contrast = 0;
- *hue = 0;
-
- return true;
-}
-*/
\ No newline at end of file
diff --git a/lib/engine/components/opal/opal-videoinput.h b/lib/engine/components/opal/opal-videoinput.h
index 9ed26e4..17929a0 100644
--- a/lib/engine/components/opal/opal-videoinput.h
+++ b/lib/engine/components/opal/opal-videoinput.h
@@ -31,7 +31,7 @@
* ------------------------------
* begin : Mon Feb 12 2001
* copyright : (C) 2000-2006 by Damien Sandras
- * description : Video4Linux compliant functions to manipulate the
+ * description : Video4Linux compliant functions to manipulate the
* webcam device.
*
*/
@@ -45,12 +45,12 @@
#include "videoinput-core.h"
-class PVideoInputDevice_EKIGA : public PVideoInputDevice
+class PVideoInputDevice_EKIGA : public PVideoInputDevice
{
PCLASSINFO(PVideoInputDevice_EKIGA, PVideoInputDevice);
-
+
public:
-
+
/* DESCRIPTION : The constructor.
* BEHAVIOR : Creates the Fake Input Device.
* PRE : /
@@ -64,26 +64,26 @@ class PVideoInputDevice_EKIGA : public PVideoInputDevice
*/
~PVideoInputDevice_EKIGA ();
-
+
virtual bool Open (const PString &name,
bool start_immediate = TRUE);
-
+
/**Determine of the device is currently open.
*/
virtual bool IsOpen() ;
-
+
/**Close the device.
*/
virtual bool Close();
-
+
/**Start the video device I/O.
*/
virtual bool Start();
-
+
/**Stop the video device I/O capture.
*/
virtual bool Stop();
@@ -93,11 +93,11 @@ class PVideoInputDevice_EKIGA : public PVideoInputDevice
*/
virtual bool IsCapturing();
-
+
virtual bool SetFrameSize (unsigned int width,
unsigned int height);
-
-
+
+
/* DESCRIPTION : The destructor
* BEHAVIOR : /
* PRE : /
@@ -111,42 +111,42 @@ class PVideoInputDevice_EKIGA : public PVideoInputDevice
*/
virtual bool GetFrameDataNoDelay (BYTE *frame, PINDEX *i = NULL);
-
+
virtual bool TestAllFormats ();
-
+
/**Get the maximum frame size in bytes.
*/
virtual PINDEX GetMaxFrameBytes();
-
+
/** Given a preset interval of n milliseconds, this function
returns n msecs after the previous frame capture was initiated.
*/
// virtual void WaitFinishPreviousFrame();
-
+
/**Set the video format to be used.
Default behaviour sets the value of the videoFormat variable and then
returns the IsOpen() status.
*/
virtual bool SetVideoFormat (VideoFormat newFormat);
-
+
/**Get the number of video channels available on the device.
Default behaviour returns 1.
*/
virtual int GetNumChannels() ;
-
+
/**Set the video channel to be used on the device.
Default behaviour sets the value of the channelNumber variable and then
returns the IsOpen() status.
*/
virtual bool SetChannel (int newChannel);
-
+
/**Set the colour format to be used.
@@ -155,7 +155,7 @@ class PVideoInputDevice_EKIGA : public PVideoInputDevice
*/
virtual bool SetColourFormat (const PString &newFormat);
-
+
/**Set the video frame rate to be used on the device.
Default behaviour sets the value of the frameRate variable and then
@@ -163,24 +163,17 @@ class PVideoInputDevice_EKIGA : public PVideoInputDevice
*/
virtual bool SetFrameRate (unsigned rate);
-
+
virtual bool GetFrameSizeLimits (unsigned &minWidth,
unsigned &minHeight,
unsigned &maxWidth,
unsigned &maxHeight);
-
- /*virtual bool GetParameters (int *whiteness,
- int *brightness,
- int *colour,
- int *contrast,
- int *hue);
- */
virtual PStringArray GetDeviceNames() const;
static int devices_nbr;
bool is_active;
-
+
protected:
boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]