Browse Source

aja: Remove unused parameters

tytan652 3 years ago
parent
commit
79480c98d9

+ 5 - 6
plugins/aja/aja-common.cpp

@@ -201,9 +201,8 @@ void populate_pixel_format_list(NTV2DeviceID deviceID, obs_property_t *list)
 	}
 	}
 }
 }
 
 
-void populate_sdi_transport_list(obs_property_t *list,
-				 IOSelection io OBS_UNUSED,
-				 NTV2DeviceID deviceID, bool capture)
+void populate_sdi_transport_list(obs_property_t *list, NTV2DeviceID deviceID,
+				 bool capture)
 {
 {
 	if (capture) {
 	if (capture) {
 		obs_property_list_add_int(list, obs_module_text("Auto"),
 		obs_property_list_add_int(list, obs_module_text("Auto"),
@@ -1019,9 +1018,9 @@ inline bool IsStandard1080p(NTV2Standard standard)
 	return false;
 	return false;
 }
 }
 
 
-VPIDStandard DetermineVPIDStandard(NTV2DeviceID id OBS_UNUSED, IOSelection io,
-				   NTV2VideoFormat vf, NTV2PixelFormat pf,
-				   SDITransport trx, SDITransport4K t4k)
+VPIDStandard DetermineVPIDStandard(IOSelection io, NTV2VideoFormat vf,
+				   NTV2PixelFormat pf, SDITransport trx,
+				   SDITransport4K t4k)
 {
 {
 	VPIDStandard vpid = VPIDStandard_Unknown;
 	VPIDStandard vpid = VPIDStandard_Unknown;
 	auto rd = aja::DetermineRasterDefinition(vf);
 	auto rd = aja::DetermineRasterDefinition(vf);

+ 2 - 3
plugins/aja/aja-common.hpp

@@ -45,7 +45,7 @@ populate_video_format_list(NTV2DeviceID deviceID, obs_property_t *list,
 			   bool want4KHFR = false);
 			   bool want4KHFR = false);
 extern void populate_pixel_format_list(NTV2DeviceID deviceID,
 extern void populate_pixel_format_list(NTV2DeviceID deviceID,
 				       obs_property_t *list);
 				       obs_property_t *list);
-extern void populate_sdi_transport_list(obs_property_t *list, IOSelection io,
+extern void populate_sdi_transport_list(obs_property_t *list,
 					NTV2DeviceID deviceID,
 					NTV2DeviceID deviceID,
 					bool capture = false);
 					bool capture = false);
 extern void populate_sdi_4k_transport_list(obs_property_t *list);
 extern void populate_sdi_4k_transport_list(obs_property_t *list);
@@ -105,8 +105,7 @@ extern bool IsIOSelectionHDMI(IOSelection io);
 extern std::string MakeCardID(CNTV2Card &card);
 extern std::string MakeCardID(CNTV2Card &card);
 
 
 extern RasterDefinition DetermineRasterDefinition(NTV2VideoFormat vf);
 extern RasterDefinition DetermineRasterDefinition(NTV2VideoFormat vf);
-extern VPIDStandard DetermineVPIDStandard(NTV2DeviceID id, IOSelection io,
-					  NTV2VideoFormat vf,
+extern VPIDStandard DetermineVPIDStandard(IOSelection io, NTV2VideoFormat vf,
 					  NTV2PixelFormat pf, SDITransport trx,
 					  NTV2PixelFormat pf, SDITransport trx,
 					  SDITransport4K t4k);
 					  SDITransport4K t4k);
 extern std::vector<NTV2DeviceID> MultiViewCards();
 extern std::vector<NTV2DeviceID> MultiViewCards();

+ 1 - 1
plugins/aja/aja-output.cpp

@@ -67,7 +67,7 @@ static void update_sdi_transport_and_sdi_transport_4k(obs_properties_t *props,
 	obs_property_t *sdi_trx_list =
 	obs_property_t *sdi_trx_list =
 		obs_properties_get(props, kUIPropSDITransport.id);
 		obs_properties_get(props, kUIPropSDITransport.id);
 	obs_property_list_clear(sdi_trx_list);
 	obs_property_list_clear(sdi_trx_list);
-	populate_sdi_transport_list(sdi_trx_list, io, device_id);
+	populate_sdi_transport_list(sdi_trx_list, device_id);
 	obs_property_t *sdi_4k_trx_list =
 	obs_property_t *sdi_4k_trx_list =
 		obs_properties_get(props, kUIPropSDITransport4K.id);
 		obs_properties_get(props, kUIPropSDITransport4K.id);
 	obs_property_list_clear(sdi_4k_trx_list);
 	obs_property_list_clear(sdi_4k_trx_list);

+ 4 - 6
plugins/aja/aja-routing.cpp

@@ -233,7 +233,7 @@ bool Routing::ConfigureSourceRoute(const SourceProps &props, NTV2Mode mode,
 		}
 		}
 		if (vpidStandard == VPIDStandard_Unknown) {
 		if (vpidStandard == VPIDStandard_Unknown) {
 			vpidStandard = DetermineVPIDStandard(
 			vpidStandard = DetermineVPIDStandard(
-				deviceID, props.ioSelect, props.videoFormat,
+				props.ioSelect, props.videoFormat,
 				props.pixelFormat, props.sdiTransport,
 				props.pixelFormat, props.sdiTransport,
 				props.sdi4kTransport);
 				props.sdi4kTransport);
 		}
 		}
@@ -375,11 +375,9 @@ bool Routing::ConfigureOutputRoute(const OutputProps &props, NTV2Mode mode,
 	HDMIWireFormat hwf = HDMIWireFormat::Unknown;
 	HDMIWireFormat hwf = HDMIWireFormat::Unknown;
 	if (NTV2_OUTPUT_DEST_IS_SDI(init_dest)) {
 	if (NTV2_OUTPUT_DEST_IS_SDI(init_dest)) {
 		kind = ConnectionKind::SDI;
 		kind = ConnectionKind::SDI;
-		vpidStandard = DetermineVPIDStandard(deviceID, props.ioSelect,
-						     props.videoFormat,
-						     props.pixelFormat,
-						     props.sdiTransport,
-						     props.sdi4kTransport);
+		vpidStandard = DetermineVPIDStandard(
+			props.ioSelect, props.videoFormat, props.pixelFormat,
+			props.sdiTransport, props.sdi4kTransport);
 	} else if (NTV2_OUTPUT_DEST_IS_HDMI(init_dest)) {
 	} else if (NTV2_OUTPUT_DEST_IS_HDMI(init_dest)) {
 		kind = ConnectionKind::HDMI;
 		kind = ConnectionKind::HDMI;
 		hwf = HDMIWireFormat::Unknown;
 		hwf = HDMIWireFormat::Unknown;

+ 1 - 1
plugins/aja/aja-source.cpp

@@ -694,7 +694,7 @@ bool aja_source_device_changed(void *data, obs_properties_t *props,
 	IOSelection io_select = static_cast<IOSelection>(
 	IOSelection io_select = static_cast<IOSelection>(
 		obs_data_get_int(settings, kUIPropInput.id));
 		obs_data_get_int(settings, kUIPropInput.id));
 	obs_property_list_clear(sdi_trx_list);
 	obs_property_list_clear(sdi_trx_list);
-	populate_sdi_transport_list(sdi_trx_list, io_select, deviceID, true);
+	populate_sdi_transport_list(sdi_trx_list, deviceID, true);
 
 
 	obs_property_list_clear(sdi_4k_list);
 	obs_property_list_clear(sdi_4k_list);
 	populate_sdi_4k_transport_list(sdi_4k_list);
 	populate_sdi_4k_transport_list(sdi_4k_list);