[cheese/camerabin: 20/20] Merge branch 'master' into camerabin

[Luciana Fujii Pontello <lufujii src gnome org>]

commit 3fa311f0503415fbaeeec10f4e74fc1a3e1d9a13
Merge: 3ad656d f12c94c
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Wed Feb 2 20:01:11 2011 -0200

    Merge branch 'master' into camerabin
    
    Conflicts:
    	libcheese/cheese-camera.c

 .gitignore                                |    3 +-
 Makefile.am                               |    5 -
 NEWS                                      |   58 +++
 configure.ac                              |   38 +-
 data/Makefile.am                          |   10 +
 cheese-gtk.pc.in => data/cheese-gtk.pc.in |    0
 data/cheese.pc.in                         |   13 +
 docs/reference/Makefile.am                |    3 +-
 libcheese/Makefile.am                     |   36 +-
 libcheese/cheese-avatar-chooser.c         |   49 +--
 libcheese/cheese-camera-device-monitor.h  |    1 -
 libcheese/cheese-camera.c                 |   86 ++--
 libcheese/cheese-camera.h                 |   19 +-
 libcheese/cheese-countdown.c              |  691 ----------------------------
 libcheese/cheese-countdown.h              |   57 ---
 libcheese/cheese-gtk.symbols              |    3 +
 po/POTFILES.in                            |    1 -
 po/cs.po                                  |  704 +++++++++++------------------
 src/Makefile.am                           |    7 +-
 src/vapi/cheese-common.vapi               |    2 -
 tests/Makefile.am                         |   17 +-
 tests/cheese-test-camera.c                |   79 ++++
 tests/cheese-test-chooser.c               |    3 +-
 23 files changed, 539 insertions(+), 1346 deletions(-)
---
diff --cc libcheese/cheese-camera.c
index 6088838,f231e6b..c64f0b7
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@@ -45,36 -42,21 +42,34 @@@ G_DEFINE_TYPE (CheeseCamera, cheese_cam
  
  #define CHEESE_CAMERA_ERROR cheese_camera_error_quark ()
  
 +typedef enum
 +{
 +  MODE_IMAGE = 0,
 +  MODE_VIDEO
 +} GstCameraBinMode;
 +
 +typedef enum {
 +  GST_CAMERABIN_FLAG_SOURCE_RESIZE               = (1 << 0),
 +  GST_CAMERABIN_FLAG_SOURCE_COLOR_CONVERSION     = (1 << 1),
 +  GST_CAMERABIN_FLAG_VIEWFINDER_COLOR_CONVERSION = (1 << 2),
 +  GST_CAMERABIN_FLAG_VIEWFINDER_SCALE            = (1 << 3),
 +  GST_CAMERABIN_FLAG_AUDIO_CONVERSION            = (1 << 4),
 +  GST_CAMERABIN_FLAG_DISABLE_AUDIO               = (1 << 5),
 +  GST_CAMERABIN_FLAG_IMAGE_COLOR_CONVERSION      = (1 << 6),
 +  GST_CAMERABIN_FLAG_VIDEO_COLOR_CONVERSION      = (1 << 7)
 +} GstCameraBinFlags;
 +
 +
  typedef struct
  {
-   GtkWidget *video_window;
- 
 -  GstElement *pipeline;
    GstBus *bus;
  
 -  /* We build the active pipeline by linking the appropriate pipelines listed below*/
 -  GstElement *camera_source_bin;
 -  GstElement *video_display_bin;
 -  GstElement *photo_save_bin;
 -  GstElement *video_save_bin;
 +  GstElement *camerabin;
 +  GstElement *video_filter_bin;
 +  GstElement *effects_preview_bin;
  
    GstElement *video_source;
 -  GstElement *capsfilter;
    GstElement *video_file_sink;
 -  GstElement *photo_sink;
    GstElement *audio_source;
    GstElement *audio_enc;
    GstElement *video_enc;
@@@ -788,20 -930,8 +781,20 @@@ cheese_camera_stop_video_recording (Che
    }
  }
  
 +static void
 +cheese_camera_image_done_cb (GstElement *camerabin, gchar *filename,
 +                             CheeseCamera *camera)
 +{
 +  CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
 +  g_signal_handler_disconnect (G_OBJECT (priv->camerabin),
 +                               priv->photo_handler_signal_id);
 +  priv->photo_handler_signal_id = 0;
 +  if (priv->photo_filename != NULL)
 +    g_signal_emit (camera, camera_signals[PHOTO_SAVED], 0);
 +}
 +
  gboolean
- cheese_camera_take_photo (CheeseCamera *camera, char *filename)
+ cheese_camera_take_photo (CheeseCamera *camera, const char *filename)
  {
    CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);