1 files changed, 53 insertions, 53 deletions

diff --git a/gst/camerabin/camerabinvideo.c b/gst/camerabin/camerabinvideo.c
index e88f2aafc..935f3020f 100644
--- a/gst/camerabin/camerabinvideo.c
+++ b/gst/camerabin/camerabinvideo.c
@@ -166,11 +166,11 @@ gst_camerabin_video_init (GstCameraBinVideo * vid,
 {
   vid->filename = g_string_new ("");
 
-  vid->user_post = NULL;
-  vid->user_vid_enc = NULL;
-  vid->user_aud_enc = NULL;
-  vid->user_aud_src = NULL;
-  vid->user_mux = NULL;
+  vid->app_post = NULL;
+  vid->app_vid_enc = NULL;
+  vid->app_aud_enc = NULL;
+  vid->app_aud_src = NULL;
+  vid->app_mux = NULL;
 
   vid->aud_src = NULL;
   vid->sink = NULL;
@@ -216,29 +216,29 @@ gst_camerabin_video_dispose (GstCameraBinVideo * vid)
     vid->vid_sink_probe_id = 0;
   }
 
-  if (vid->user_post) {
-    gst_object_unref (vid->user_post);
-    vid->user_post = NULL;
+  if (vid->app_post) {
+    gst_object_unref (vid->app_post);
+    vid->app_post = NULL;
   }
 
-  if (vid->user_vid_enc) {
-    gst_object_unref (vid->user_vid_enc);
-    vid->user_vid_enc = NULL;
+  if (vid->app_vid_enc) {
+    gst_object_unref (vid->app_vid_enc);
+    vid->app_vid_enc = NULL;
   }
 
-  if (vid->user_aud_enc) {
-    gst_object_unref (vid->user_aud_enc);
-    vid->user_aud_enc = NULL;
+  if (vid->app_aud_enc) {
+    gst_object_unref (vid->app_aud_enc);
+    vid->app_aud_enc = NULL;
   }
 
-  if (vid->user_aud_src) {
-    gst_object_unref (vid->user_aud_src);
-    vid->user_aud_src = NULL;
+  if (vid->app_aud_src) {
+    gst_object_unref (vid->app_aud_src);
+    vid->app_aud_src = NULL;
   }
 
-  if (vid->user_mux) {
-    gst_object_unref (vid->user_mux);
-    vid->user_mux = NULL;
+  if (vid->app_mux) {
+    gst_object_unref (vid->app_mux);
+    vid->app_mux = NULL;
   }
 
   G_OBJECT_CLASS (parent_class)->dispose ((GObject *) vid);
@@ -548,11 +548,11 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
   vid->calculate_adjust_ts_aud = FALSE;
 
   /* Add video post processing element if any */
-  if (vid->user_post) {
-    if (!gst_camerabin_add_element (vidbin, vid->user_post)) {
+  if (vid->app_post) {
+    if (!gst_camerabin_add_element (vidbin, vid->app_post)) {
       goto error;
     }
-    vid_sinkpad = gst_element_get_static_pad (vid->user_post, "sink");
+    vid_sinkpad = gst_element_get_static_pad (vid->app_post, "sink");
   }
 
   /* Add tee element */
@@ -580,8 +580,8 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
       G_CALLBACK (camerabin_video_pad_tee_src0_have_buffer), vid);
 
   /* Add user set or default video encoder element */
-  if (vid->user_vid_enc) {
-    vid->vid_enc = vid->user_vid_enc;
+  if (vid->app_vid_enc) {
+    vid->vid_enc = vid->app_vid_enc;
     if (!gst_camerabin_add_element (vidbin, vid->vid_enc)) {
       goto error;
     }
@@ -590,9 +590,9 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
     goto error;
   }
 
-  /* Add user set or default muxer element */
-  if (vid->user_mux) {
-    vid->muxer = vid->user_mux;
+  /* Add application set or default muxer element */
+  if (vid->app_mux) {
+    vid->muxer = vid->app_mux;
     if (!gst_camerabin_add_element (vidbin, vid->muxer)) {
       goto error;
     }
@@ -610,9 +610,9 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
       NULL);
 
   if (!(vid->flags & GST_CAMERABIN_FLAG_DISABLE_AUDIO)) {
-    /* Add user set or default audio source element */
+    /* Add application set or default audio source element */
     if (!(vid->aud_src = gst_camerabin_setup_default_element (vidbin,
-                vid->user_aud_src, "autoaudiosrc", DEFAULT_AUDIOSRC))) {
+                vid->app_aud_src, "autoaudiosrc", DEFAULT_AUDIOSRC))) {
       vid->aud_src = NULL;
       goto error;
     } else {
@@ -644,9 +644,9 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
       g_object_set (vid->volume, "mute", vid->mute, NULL);
     }
 
-    /* Add user set or default audio encoder element */
-    if (vid->user_aud_enc) {
-      vid->aud_enc = vid->user_aud_enc;
+    /* Add application set or default audio encoder element */
+    if (vid->app_aud_enc) {
+      vid->aud_enc = vid->app_aud_enc;
       if (!gst_camerabin_add_element (vidbin, vid->aud_enc)) {
         goto error;
       }
@@ -787,12 +787,12 @@ gst_camerabin_video_set_mute (GstCameraBinVideo * vid, gboolean mute)
 void
 gst_camerabin_video_set_post (GstCameraBinVideo * vid, GstElement * post)
 {
-  GstElement **user_post;
+  GstElement **app_post;
   GST_DEBUG_OBJECT (vid, "setting video post processing: %" GST_PTR_FORMAT,
       post);
   GST_OBJECT_LOCK (vid);
-  user_post = &vid->user_post;
-  gst_object_replace ((GstObject **) user_post, GST_OBJECT (post));
+  app_post = &vid->app_post;
+  gst_object_replace ((GstObject **) app_post, GST_OBJECT (post));
   GST_OBJECT_UNLOCK (vid);
 }
 
@@ -800,11 +800,11 @@ void
 gst_camerabin_video_set_video_enc (GstCameraBinVideo * vid,
     GstElement * video_enc)
 {
-  GstElement **user_vid_enc;
+  GstElement **app_vid_enc;
   GST_DEBUG_OBJECT (vid, "setting video encoder: %" GST_PTR_FORMAT, video_enc);
   GST_OBJECT_LOCK (vid);
-  user_vid_enc = &vid->user_vid_enc;
-  gst_object_replace ((GstObject **) user_vid_enc, GST_OBJECT (video_enc));
+  app_vid_enc = &vid->app_vid_enc;
+  gst_object_replace ((GstObject **) app_vid_enc, GST_OBJECT (video_enc));
   GST_OBJECT_UNLOCK (vid);
 }
 
@@ -812,22 +812,22 @@ void
 gst_camerabin_video_set_audio_enc (GstCameraBinVideo * vid,
     GstElement * audio_enc)
 {
-  GstElement **user_aud_enc;
+  GstElement **app_aud_enc;
   GST_DEBUG_OBJECT (vid, "setting audio encoder: %" GST_PTR_FORMAT, audio_enc);
   GST_OBJECT_LOCK (vid);
-  user_aud_enc = &vid->user_aud_enc;
-  gst_object_replace ((GstObject **) user_aud_enc, GST_OBJECT (audio_enc));
+  app_aud_enc = &vid->app_aud_enc;
+  gst_object_replace ((GstObject **) app_aud_enc, GST_OBJECT (audio_enc));
   GST_OBJECT_UNLOCK (vid);
 }
 
 void
 gst_camerabin_video_set_muxer (GstCameraBinVideo * vid, GstElement * muxer)
 {
-  GstElement **user_mux;
+  GstElement **app_mux;
   GST_DEBUG_OBJECT (vid, "setting muxer: %" GST_PTR_FORMAT, muxer);
   GST_OBJECT_LOCK (vid);
-  user_mux = &vid->user_mux;
-  gst_object_replace ((GstObject **) user_mux, GST_OBJECT (muxer));
+  app_mux = &vid->app_mux;
+  gst_object_replace ((GstObject **) app_mux, GST_OBJECT (muxer));
   GST_OBJECT_UNLOCK (vid);
 }
 
@@ -835,11 +835,11 @@ void
 gst_camerabin_video_set_audio_src (GstCameraBinVideo * vid,
     GstElement * audio_src)
 {
-  GstElement **user_aud_src;
+  GstElement **app_aud_src;
   GST_DEBUG_OBJECT (vid, "setting audio source: %" GST_PTR_FORMAT, audio_src);
   GST_OBJECT_LOCK (vid);
-  user_aud_src = &vid->user_aud_src;
-  gst_object_replace ((GstObject **) user_aud_src, GST_OBJECT (audio_src));
+  app_aud_src = &vid->app_aud_src;
+  gst_object_replace ((GstObject **) app_aud_src, GST_OBJECT (audio_src));
   GST_OBJECT_UNLOCK (vid);
 }
 
@@ -868,29 +868,29 @@ gst_camerabin_video_get_mute (GstCameraBinVideo * vid)
 GstElement *
 gst_camerabin_video_get_post (GstCameraBinVideo * vid)
 {
-  return vid->user_post;
+  return vid->app_post;
 }
 
 GstElement *
 gst_camerabin_video_get_video_enc (GstCameraBinVideo * vid)
 {
-  return vid->vid_enc ? vid->vid_enc : vid->user_vid_enc;
+  return vid->vid_enc ? vid->vid_enc : vid->app_vid_enc;
 }
 
 GstElement *
 gst_camerabin_video_get_audio_enc (GstCameraBinVideo * vid)
 {
-  return vid->aud_enc ? vid->aud_enc : vid->user_aud_enc;
+  return vid->aud_enc ? vid->aud_enc : vid->app_aud_enc;
 }
 
 GstElement *
 gst_camerabin_video_get_muxer (GstCameraBinVideo * vid)
 {
-  return vid->muxer ? vid->muxer : vid->user_mux;
+  return vid->muxer ? vid->muxer : vid->app_mux;
 }
 
 GstElement *
 gst_camerabin_video_get_audio_src (GstCameraBinVideo * vid)
 {
-  return vid->aud_src ? vid->aud_src : vid->user_aud_src;
+  return vid->aud_src ? vid->aud_src : vid->app_aud_src;
 }