Fix Carriage Returns

diff --git a/gst-sdk/tutorials/playback-tutorial-5.c b/gst-sdk/tutorials/playback-tutorial-5.c
index ce04f81..1fc58d4 100644 (file)
--- a/gst-sdk/tutorials/playback-tutorial-5.c
+++ b/gst-sdk/tutorials/playback-tutorial-5.c
@@ -1,182 +1,185 @@
-#include <string.h>\r
-#include <gst/gst.h>\r
-#include <gst/interfaces/colorbalance.h>\r
-  \r
+#include <string.h>
+#include <gst/gst.h>
+#include <gst/interfaces/colorbalance.h>
+  
 typedef struct _CustomData {
   GstElement *pipeline;
   GMainLoop *loop;
-} CustomData;\r
-  \r
+} CustomData;
+  
 /* playbin2 flags */
 typedef enum {
   GST_PLAY_FLAG_DEINTERLACE   = (1 << 9)
-} GstPlayFlags;\r
-  \r
-/* Process a color balance command */\r
-static void update_color_channel (const gchar *channel_name, gboolean increase, GstColorBalance *cb) {\r
-  gdouble step;\r
-  gint value;\r
-  GstColorBalanceChannel *channel = NULL;\r
-  const GList *channels, *l;\r
-  \r
-  /* Retrieve the list of channels and locate the requested one */\r
-  channels = gst_color_balance_list_channels (cb);\r
-  for (l = channels; l != NULL; l = l->next) {\r
-    GstColorBalanceChannel *tmp = (GstColorBalanceChannel *)l->data;\r
-    \r
-    if (g_strrstr (tmp->label, channel_name)) {\r
-      channel = tmp;\r
-      break;\r
-    }\r
-  }\r
-  if (!channel)\r
-    return;\r
-  \r
-  /* Change the channel's value */\r
-  step = 0.1 * (channel->max_value - channel->min_value);\r
-  value = gst_color_balance_get_value (cb, channel);\r
-  if (increase) {\r
-    value += step;\r
-    if (value > channel->max_value)\r
-        value = channel->max_value;\r
-  } else {\r
-    value -= step;\r
-    if (value < channel->min_value)\r
-        value = channel->min_value;\r
-  }\r
-  gst_color_balance_set_value (cb, channel, value);\r
-}\r
-  \r
-/* Toggle the deinterlacing flag */\r
-static void toggle_deinterlace (GstElement *pipeline) {\r
-  gint flags;\r
-  gint64 current_position = GST_CLOCK_TIME_NONE;\r
-  GstFormat format = GST_FORMAT_TIME;\r
-  \r
-  /* Find current position, since it will be lost when we stop */\r
-  gst_element_query_position (pipeline, &format, &current_position);\r
-  /* Stop */\r
-  gst_element_set_state (pipeline, GST_STATE_READY);\r
-  /* Toggle deinterlacing flag (it will be ignored while PLAYING) */\r
-  g_object_get (pipeline, "flags", &flags, NULL);\r
-  flags ^= GST_PLAY_FLAG_DEINTERLACE;\r
-  g_object_set (pipeline, "flags", flags, NULL);\r
-  /* Resume */\r
-  gst_element_set_state (pipeline, GST_STATE_PLAYING);\r
-  /* Wait until the state change takes effect */\r
-  gst_element_get_state (pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);\r
-  /* Set current position, if we were able to recover it previously */\r
-  if (GST_CLOCK_TIME_IS_VALID (current_position)) {\r
-    gst_element_seek_simple (pipeline, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, current_position);\r
-  }\r
-}\r
-  \r
-/* Output the current values of all Color Balance channels and the Deinterlace flag */\r
-static void print_current_values (GstElement *pipeline) {\r
-  gint flags;\r
-  const GList *channels, *l;\r
-  \r
-  /* Output Color Balance values */\r
-  channels = gst_color_balance_list_channels (GST_COLOR_BALANCE (pipeline));\r
-  for (l = channels; l != NULL; l = l->next) {\r
-    GstColorBalanceChannel *channel = (GstColorBalanceChannel *)l->data;\r
-    gint value = gst_color_balance_get_value (GST_COLOR_BALANCE (pipeline), channel);\r
-    g_print ("%s: %3d%% ", channel->label,\r
-        100 * (value - channel->min_value) / (channel->max_value - channel->min_value));\r
-  }\r
-  \r
-  /* Output Deinterlace flag value */\r
-  g_object_get (pipeline, "flags", &flags, NULL);\r
-  g_print ("Deinterlacing: %s\n", flags & GST_PLAY_FLAG_DEINTERLACE ? "ON" : "OFF");\r
-}\r
-  \r
-/* Process keyboard input */\r
-static gboolean handle_keyboard (GIOChannel *source, GIOCondition cond, CustomData *data) {\r
-  gchar *str = NULL;\r
-  \r
-  if (!g_io_channel_read_line (source, &str, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {\r
-    return TRUE;\r
-  }\r
-  \r
-  switch (g_ascii_tolower (str[0])) {\r
-  case 'c':\r
-    update_color_channel ("CONTRAST", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));\r
-    break;\r
-  case 'b':\r
-    update_color_channel ("BRIGHTNESS", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));\r
-    break;\r
-  case 'h':\r
-    update_color_channel ("HUE", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));\r
-    break;\r
-  case 's':\r
-    update_color_channel ("SATURATION", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));\r
-    break;\r
-  case 'd':\r
-    toggle_deinterlace (data->pipeline);\r
-    break;\r
-  case 'q':\r
-    g_main_loop_quit (data->loop);\r
-    break;\r
-  default:\r
-    break;\r
-  }\r
-  \r
-  g_free (str);\r
-  \r
-  print_current_values (data->pipeline);\r
-  \r
-  return TRUE;\r
-}\r
-  \r
-int main(int argc, char *argv[]) {\r
-  CustomData data;\r
-  GstStateChangeReturn ret;\r
-  GIOChannel *io_stdin;\r
-   \r
-  /* Initialize GStreamer */\r
-  gst_init (&argc, &argv);\r
-  
-  /* Initialize our data structure */\r
-  memset (&data, 0, sizeof (data));\r
-  \r
-  /* Print usage map */\r
-  g_print (\r
-    "USAGE: Choose one of the following options, then press enter:\n"\r
-    " 'C' to increase contrast, 'c' to decrease contrast\n"\r
-    " 'B' to increase brightness, 'b' to decrease brightness\n"\r
-    " 'H' to increase hue, 'h' to decrease hue\n"\r
-    " 'S' to increase saturation, 's' to decrease saturation\n"\r
-    " 'D' to toggle deinterlacing ON and OFF\n"\r
-    " 'Q' to quit\n");\r
-  \r
-  /* Build the pipeline */\r
-  data.pipeline = gst_parse_launch ("playbin2 uri=http://docs.gstreamer.com/media/sintel_trailer-480i.avi", NULL);\r
-  \r
-  /* Add a keyboard watch so we get notified of keystrokes */\r
-#ifdef _WIN32\r
-  io_stdin = g_io_channel_win32_new_fd (fileno (stdin));\r
-#else\r
-  io_stdin = g_io_channel_unix_new (fileno (stdin));\r
-#endif\r
-  g_io_add_watch (io_stdin, G_IO_IN, (GIOFunc)handle_keyboard, &data);\r
-  \r
-  /* Start playing */\r
-  ret = gst_element_set_state (data.pipeline, GST_STATE_PLAYING);\r
-  if (ret == GST_STATE_CHANGE_FAILURE) {\r
-    g_printerr ("Unable to set the pipeline to the playing state.\n");\r
-    gst_object_unref (data.pipeline);\r
-    return -1;\r
-  }\r
-  print_current_values (data.pipeline);\r
-   \r
-  /* Create a GLib Main Loop and set it to run */\r
-  data.loop = g_main_loop_new (NULL, FALSE);\r
-  g_main_loop_run (data.loop);\r
-  \r
-  /* Free resources */\r
-  g_main_loop_unref (data.loop);\r
-  g_io_channel_unref (io_stdin);\r
-  gst_element_set_state (data.pipeline, GST_STATE_NULL);\r
-  gst_object_unref (data.pipeline);\r
-  return 0;\r
-}\r
+} GstPlayFlags;
+  
+/* Process a color balance command */
+static void update_color_channel (const gchar *channel_name, gboolean increase, GstColorBalance *cb) {
+  gdouble step;
+  gint value;
+  GstColorBalanceChannel *channel = NULL;
+  const GList *channels, *l;
+  
+  /* Retrieve the list of channels and locate the requested one */
+  channels = gst_color_balance_list_channels (cb);
+  for (l = channels; l != NULL; l = l->next) {
+    GstColorBalanceChannel *tmp = (GstColorBalanceChannel *)l->data;
+    
+    if (g_strrstr (tmp->label, channel_name)) {
+      channel = tmp;
+      break;
+    }
+  }
+  if (!channel)
+    return;
+  
+  /* Change the channel's value */
+  step = 0.1 * (channel->max_value - channel->min_value);
+  value = gst_color_balance_get_value (cb, channel);
+  if (increase) {
+    value += step;
+    if (value > channel->max_value)
+        value = channel->max_value;
+  } else {
+    value -= step;
+    if (value < channel->min_value)
+        value = channel->min_value;
+  }
+  gst_color_balance_set_value (cb, channel, value);
+}
+  
+/* Toggle the deinterlacing flag */
+static void toggle_deinterlace (GstElement *pipeline) {
+  gint flags;
+  gint64 current_position = GST_CLOCK_TIME_NONE;
+  GstFormat format = GST_FORMAT_TIME;
+  
+  /* Find current position, since it will be lost when we stop */
+  gst_element_query_position (pipeline, &format, &current_position);
+  /* Stop */
+  GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN (pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "before.dot");
+  gst_element_set_state (pipeline, GST_STATE_READY);
+  /* Toggle deinterlacing flag (it will be ignored while PLAYING) */
+  g_object_get (pipeline, "flags", &flags, NULL);
+  flags ^= GST_PLAY_FLAG_DEINTERLACE;
+  g_object_set (pipeline, "flags", flags, NULL);
+  /* Resume */
+  gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  /* Wait until the state change takes effect */
+  gst_element_get_state (pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
+  GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN (pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "after.dot");
+  /* Set current position, if we were able to recover it previously */
+  if (GST_CLOCK_TIME_IS_VALID (current_position)) {
+    gst_element_seek_simple (pipeline, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, current_position);
+  }
+}
+  
+/* Output the current values of all Color Balance channels and the Deinterlace flag */
+static void print_current_values (GstElement *pipeline) {
+  gint flags;
+  const GList *channels, *l;
+  
+  /* Output Color Balance values */
+  channels = gst_color_balance_list_channels (GST_COLOR_BALANCE (pipeline));
+  for (l = channels; l != NULL; l = l->next) {
+    GstColorBalanceChannel *channel = (GstColorBalanceChannel *)l->data;
+    gint value = gst_color_balance_get_value (GST_COLOR_BALANCE (pipeline), channel);
+    g_print ("%s: %3d%% ", channel->label,
+        100 * (value - channel->min_value) / (channel->max_value - channel->min_value));
+  }
+  
+  /* Output Deinterlace flag value */
+  g_object_get (pipeline, "flags", &flags, NULL);
+  g_print ("Deinterlacing: %s\n", flags & GST_PLAY_FLAG_DEINTERLACE ? "ON" : "OFF");
+}
+  
+/* Process keyboard input */
+static gboolean handle_keyboard (GIOChannel *source, GIOCondition cond, CustomData *data) {
+  gchar *str = NULL;
+  
+  if (!g_io_channel_read_line (source, &str, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {
+    return TRUE;
+  }
+  
+  switch (g_ascii_tolower (str[0])) {
+  case 'c':
+    update_color_channel ("CONTRAST", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));
+    break;
+  case 'b':
+    update_color_channel ("BRIGHTNESS", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));
+    break;
+  case 'h':
+    update_color_channel ("HUE", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));
+    break;
+  case 's':
+    update_color_channel ("SATURATION", g_ascii_isupper (str[0]), GST_COLOR_BALANCE (data->pipeline));
+    break;
+  case 'd':
+    toggle_deinterlace (data->pipeline);
+    break;
+  case 'q':
+    g_main_loop_quit (data->loop);
+    break;
+  default:
+    break;
+  }
+  
+  g_free (str);
+  
+  print_current_values (data->pipeline);
+  
+  return TRUE;
+}
+  
+int main(int argc, char *argv[]) {
+  CustomData data;
+  GstStateChangeReturn ret;
+  GIOChannel *io_stdin;
+   
+  /* Initialize GStreamer */
+  gst_init (&argc, &argv);
+  
+  /* Initialize our data structure */
+  memset (&data, 0, sizeof (data));
+  
+  /* Print usage map */
+  g_print (
+    "USAGE: Choose one of the following options, then press enter:\n"
+    " 'C' to increase contrast, 'c' to decrease contrast\n"
+    " 'B' to increase brightness, 'b' to decrease brightness\n"
+    " 'H' to increase hue, 'h' to decrease hue\n"
+    " 'S' to increase saturation, 's' to decrease saturation\n"
+    " 'D' to toggle deinterlacing ON and OFF\n"
+    " 'Q' to quit\n");
+  
+  /* Build the pipeline */
+  data.pipeline = gst_parse_launch ("playbin2 uri=http://docs.gstreamer.com/media/sintel_trailer-480i.avi", NULL);
+  g_object_set (data.pipeline, "flags", (gint)0x0417, NULL);
+  
+  /* Add a keyboard watch so we get notified of keystrokes */
+#ifdef _WIN32
+  io_stdin = g_io_channel_win32_new_fd (fileno (stdin));
+#else
+  io_stdin = g_io_channel_unix_new (fileno (stdin));
+#endif
+  g_io_add_watch (io_stdin, G_IO_IN, (GIOFunc)handle_keyboard, &data);
+  
+  /* Start playing */
+  ret = gst_element_set_state (data.pipeline, GST_STATE_PLAYING);
+  if (ret == GST_STATE_CHANGE_FAILURE) {
+    g_printerr ("Unable to set the pipeline to the playing state.\n");
+    gst_object_unref (data.pipeline);
+    return -1;
+  }
+  print_current_values (data.pipeline);
+   
+  /* Create a GLib Main Loop and set it to run */
+  data.loop = g_main_loop_new (NULL, FALSE);
+  g_main_loop_run (data.loop);
+  
+  /* Free resources */
+  g_main_loop_unref (data.loop);
+  g_io_channel_unref (io_stdin);
+  gst_element_set_state (data.pipeline, GST_STATE_NULL);
+  gst_object_unref (data.pipeline);
+  return 0;
+}