[mousetrap/gnome3-wip: 95/240] Default camera width to 320x240 and default to joystick

[Heidi Ellis <heidiellis src gnome org>]

commit dd2e548e637c385ef248f5fe9940ac9749acb969
Author: Kevin Brown <kbrown rediker com>
Date:   Fri Jun 13 20:08:57 2014 -0400

    Default camera width to 320x240 and default to joystick
    
    Most webcams allow for a resolution to be set at 320x240, so it
    makes sense for the defaults to be bumped slightly to meet this.
    In the future, this should be configurable, similar to how it is
    done in the Cheese photo capture application.
    
    The default controller has also been changed to the joystick.  While
    the other controller works as expected, the boundaries of the image
    are set to the boundaries for the image, requiring the user's face
    to fill the entire webcam.  The joystick controller does not
    require this, as it works relative to the original calibrated point.

 src/mousetrap/image.py |    1 -
 src/mousetrap/main.py  |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/mousetrap/image.py b/src/mousetrap/image.py
index 9af7a54..100344e 100644
--- a/src/mousetrap/image.py
+++ b/src/mousetrap/image.py
@@ -67,4 +67,3 @@ def _cvimage_to_pixbuf(cvimage):
             destroy_fn,
             destroy_fn_data
             )
-
diff --git a/src/mousetrap/main.py b/src/mousetrap/main.py
index 21fe111..341eef8 100644
--- a/src/mousetrap/main.py
+++ b/src/mousetrap/main.py
@@ -6,7 +6,7 @@ from datetime import datetime
 from gi.repository import GObject
 from mousetrap.vision import Camera
 from mousetrap.gui import ScreenPointer, Gui
-from mousetrap.pointers.nose import Pointer
+from mousetrap.pointers.nose_joystick import Pointer
 
 
 FPS = 10
@@ -17,7 +17,7 @@ class Main(object):
     def __init__(self):
         self.timeout_id = None
         self.camera = Camera()
-        self.camera.set_dimensions(300, 200)
+        self.camera.set_dimensions(320, 240)
         self.gui = Gui()
         self.pointer = ScreenPointer()
         self.nose = Pointer()