fraxinas/photobooth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

whitespace fixups

Browse source
This commit is contained in:
Andreas Frisch 2017-07-25 13:34:00 +02:00
parent bb3cfcb6cb
commit 983fa56247
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
photobooth.c
View file

@ -127,7 +127,7 @@ GST_DEBUG_CATEGORY_STATIC (photo_booth_debug);
/* GObject / GApplication */ /* GObject / GApplication */
static void photo_booth_activate (GApplication *app); static void photo_booth_activate (GApplication *app);
static void photo_booth_open (GApplication *app, GFile **files, gint n_files, const gchar *hint); static void photo_booth_open (GApplication *app, GFile **files, gint n_files, const gchar *hint);
static void photo_booth_dispose (GObject *object); static void photo_booth_dispose (GObject *object);
static void photo_booth_finalize (GObject *object); static void photo_booth_finalize (GObject *object);
PhotoBooth *photo_booth_new (void); PhotoBooth *photo_booth_new (void);
@ -1269,9 +1269,9 @@ static GstPadProbeReturn photo_booth_screensaver_unplug_continue (GstPad * pad,
g_mutex_lock (&priv->processing_mutex); g_mutex_lock (&priv->processing_mutex);
GstPad *sinkpad; GstPad *sinkpad;
sinkpad = gst_element_get_static_pad (pb->video_sink, "sink"); sinkpad = gst_element_get_static_pad (pb->video_sink, "sink");
priv->sink_block_id = gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM, _gst_video_probecb, pb, NULL); priv->sink_block_id = gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM, _gst_video_probecb, pb, NULL);
gst_element_query_position (priv->screensaver_playbin, GST_FORMAT_TIME, &priv->last_play_pos); gst_element_query_position (priv->screensaver_playbin, GST_FORMAT_TIME, &priv->last_play_pos);
GST_DEBUG ("stop screensaver @ %" GST_TIME_FORMAT " %" GST_PTR_FORMAT " block_id=%lu", GST_TIME_ARGS (priv->last_play_pos), pad, priv->sink_block_id ); GST_DEBUG ("stop screensaver @ %" GST_TIME_FORMAT " %" GST_PTR_FORMAT " block_id=%lu", GST_TIME_ARGS (priv->last_play_pos), pad, priv->sink_block_id );

4
photobooth.h
View file

@ -126,9 +126,9 @@ struct _PhotoBoothClass
GtkApplicationClass parent_class; GtkApplicationClass parent_class;
}; };
GType photo_booth_get_type (void); GType photo_booth_get_type (void);
PhotoBooth *photo_booth_new (void); PhotoBooth *photo_booth_new (void);
void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename); void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename);
G_END_DECLS G_END_DECLS

6
photoboothled.c
View file

@ -36,7 +36,7 @@ static void photo_booth_led_class_init (PhotoBoothLedClass *klass)
GST_DEBUG_CATEGORY_INIT (photo_booth_led_debug, "photoboothled", GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_BLUE, "PhotoBoothLed"); GST_DEBUG_CATEGORY_INIT (photo_booth_led_debug, "photoboothled", GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_BLUE, "PhotoBoothLed");
gobject_class->finalize = photo_booth_led_finalize; gobject_class->finalize = photo_booth_led_finalize;
} }
static void photo_booth_led_init (PhotoBoothLed *led) static void photo_booth_led_init (PhotoBoothLed *led)
@ -152,10 +152,10 @@ void photo_booth_led_printer (PhotoBoothLed *led, gint copies)
g_free (cmd); g_free (cmd);
* arduino doesn't process this correctly */ * arduino doesn't process this correctly */
char cmd = LED_PRINT; char cmd = LED_PRINT;
write (led->fd, &cmd, 1); write (led->fd, &cmd, 1);
cmd = copies+0x30; //!HACK won't work for >9 copies cmd = copies+0x30; //!HACK won't work for >9 copies
write (led->fd, &cmd, 1); write (led->fd, &cmd, 1);
GST_DEBUG_OBJECT(led, "printing %c%i", cmd, copies); GST_DEBUG_OBJECT(led, "printing %c%i", cmd, copies);
} }
} }

10
photoboothwin.c
View file

@ -192,11 +192,11 @@ void photo_booth_window_start_countdown (PhotoBoothWindow *win, gint count)
priv->countdown = count+1; priv->countdown = count+1;
_pbw_tick_countdown(win); _pbw_tick_countdown(win);
gtk_widget_show (GTK_WIDGET (priv->countdown_label)); gtk_widget_show (GTK_WIDGET (priv->countdown_label));
for (int i = 1; i <= count+2; i++) for (int i = 1; i <= count+2; i++)
{ {
g_timeout_add (1000*i, (GSourceFunc) _pbw_tick_countdown, win); g_timeout_add (1000*i, (GSourceFunc) _pbw_tick_countdown, win);
GST_INFO ("added timeout callback at %i", 1000*i); GST_INFO ("added timeout callback at %i", 1000*i);
} }
} }
void photo_booth_window_set_copies_show (PhotoBoothWindow *win, gint min, gint max, gint def) void photo_booth_window_set_copies_show (PhotoBoothWindow *win, gint min, gint max, gint def)