From 4cdd234add2c1f10e47ec014604ef3c22a99a7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 27 Jan 2017 19:24:03 +0200 Subject: [PATCH] decklink: Fix indentation --- sys/decklink/gstdecklink.cpp | 10 +++++----- sys/decklink/gstdecklink.h | 4 ++-- sys/decklink/gstdecklinkvideosrc.cpp | 9 ++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index 28cd9e7488..810b1141d8 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -451,7 +451,7 @@ gst_decklink_timecode_format_to_enum (BMDTimecodeFormat f) } static const BMDVideoConnection connections[] = { - (BMDVideoConnection)0, /* auto */ + (BMDVideoConnection) 0, /* auto */ bmdVideoConnectionSDI, bmdVideoConnectionHDMI, bmdVideoConnectionOpticalSDI, @@ -757,7 +757,7 @@ public: void (*got_video_frame) (GstElement * videosrc, IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode, GstClockTime capture_time, GstClockTime stream_time, - GstClockTime stream_duration, IDeckLinkTimecode *dtc, gboolean + GstClockTime stream_duration, IDeckLinkTimecode * dtc, gboolean no_signal) = NULL; void (*got_audio_packet) (GstElement * videosrc, IDeckLinkAudioInputPacket * packet, GstClockTime capture_time, @@ -967,9 +967,9 @@ init_devices (gpointer data) GST_DEBUG ("Input %d supports:", i); while ((ret = mode_iter->Next (&mode)) == S_OK) { - const char* name; + const char *name; - mode->GetName ((COMSTR_T *) &name); + mode->GetName ((COMSTR_T *) & name); CONVERT_COM_STRING (name); GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld" " fields: 0x%08x flags: 0x%08x", name, @@ -1007,7 +1007,7 @@ init_devices (gpointer data) while ((ret = mode_iter->Next (&mode)) == S_OK) { const char *name; - mode->GetName ((COMSTR_T *) &name); + mode->GetName ((COMSTR_T *) & name); CONVERT_COM_STRING (name); GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld" " fields: 0x%08x flags: 0x%08x", name, diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h index 4e60816c95..825b416c03 100644 --- a/sys/decklink/gstdecklink.h +++ b/sys/decklink/gstdecklink.h @@ -42,8 +42,8 @@ #define FREE_COM_STRING(s) delete[] s; #define CONVERT_COM_STRING(s) BSTR _s = (BSTR)s; s = _com_util::ConvertBSTRToString(_s); ::SysFreeString(_s); #else -#define COMSTR_T char* -#define FREE_COM_STRING(s) free ((void *) s) +#define COMSTR_T const char* +#define FREE_COM_STRING(s) #define CONVERT_COM_STRING(s) #endif /* _MSC_VER */ diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp index 4abe042af6..2fe359f27e 100644 --- a/sys/decklink/gstdecklinkvideosrc.cpp +++ b/sys/decklink/gstdecklinkvideosrc.cpp @@ -601,8 +601,7 @@ static void gst_decklink_video_src_got_frame (GstElement * element, IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode, GstClockTime capture_time, GstClockTime stream_time, - GstClockTime stream_duration, IDeckLinkTimecode *dtc, - gboolean no_signal) + GstClockTime stream_duration, IDeckLinkTimecode * dtc, gboolean no_signal) { GstDecklinkVideoSrc *self = GST_DECKLINK_VIDEO_SRC_CAST (element); GstClockTime timestamp, duration; @@ -680,7 +679,7 @@ gst_decklink_video_src_got_frame (GstElement * element, } else { bflags = dtc->GetFlags (); GST_DEBUG_OBJECT (self, "Got timecode %02d:%02d:%02d:%02d", - hours, minutes, seconds, frames); + hours, minutes, seconds, frames); bmode = gst_decklink_get_mode (mode); if (bmode->interlaced) { flags = @@ -696,8 +695,8 @@ gst_decklink_video_src_got_frame (GstElement * element, (GstVideoTimeCodeFlags) (flags | GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME); f->tc = - gst_video_time_code_new (bmode->fps_n, bmode->fps_d, NULL, flags, hours, - minutes, seconds, frames, field_count); + gst_video_time_code_new (bmode->fps_n, bmode->fps_d, NULL, flags, + hours, minutes, seconds, frames, field_count); } dtc->Release (); } else {