Browse Source

linux-pipewire: Trivially shuffle some code around

A trivial cosmetic change. This groups the constructor and
destructor together. Two sides of the same coin, yin and yang,
bound by their nature, and linked by their position in code.
Georges Basile Stavracas Neto 3 years ago
parent
commit
fad7420198
2 changed files with 15 additions and 14 deletions
  1. 13 13
      plugins/linux-pipewire/pipewire.c
  2. 2 1
      plugins/linux-pipewire/pipewire.h

+ 13 - 13
plugins/linux-pipewire/pipewire.c

@@ -836,6 +836,19 @@ obs_pipewire *obs_pipewire_create(int pipewire_fd)
 	return obs_pw;
 }
 
+void obs_pipewire_destroy(obs_pipewire *obs_pw)
+{
+	if (!obs_pw)
+		return;
+
+	teardown_pipewire(obs_pw);
+	destroy_session(obs_pw);
+
+	clear_format_info(obs_pw);
+
+	bfree(obs_pw);
+}
+
 void obs_pipewire_connect_stream(obs_pipewire *obs_pw, int pipewire_node,
 				 const char *stream_name,
 				 struct pw_properties *stream_properties)
@@ -882,19 +895,6 @@ void obs_pipewire_connect_stream(obs_pipewire *obs_pw, int pipewire_node,
 	bfree(params);
 }
 
-void obs_pipewire_destroy(obs_pipewire *obs_pw)
-{
-	if (!obs_pw)
-		return;
-
-	teardown_pipewire(obs_pw);
-	destroy_session(obs_pw);
-
-	clear_format_info(obs_pw);
-
-	bfree(obs_pw);
-}
-
 void obs_pipewire_show(obs_pipewire *obs_pw)
 {
 	if (obs_pw->stream)

+ 2 - 1
plugins/linux-pipewire/pipewire.h

@@ -28,10 +28,11 @@
 typedef struct _obs_pipewire obs_pipewire;
 
 obs_pipewire *obs_pipewire_create(int pipewire_fd);
+void obs_pipewire_destroy(obs_pipewire *obs_pw);
+
 void obs_pipewire_connect_stream(obs_pipewire *obs_pw, int pipewire_node,
 				 const char *stream_name,
 				 struct pw_properties *stream_properties);
-void obs_pipewire_destroy(obs_pipewire *obs_pw);
 
 void obs_pipewire_show(obs_pipewire *obs_pw);
 void obs_pipewire_hide(obs_pipewire *obs_pw);