From f3c6ac23a47a7088c7ec4abc603d237aa02d945c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kita?= <lukasz.kita0@gmail.com>
Date: Wed, 7 Aug 2024 14:38:24 +0200
Subject: [PATCH] Refactor namespace

---
 examples/source_with_standalone_server.exs                | 2 +-
 ...rce_client_handler.ex => client_handler_for_source.ex} | 8 +-------
 lib/membrane_rtmp_plugin/rtmp/source/source.ex            | 7 +++----
 test/membrane_rtmp_plugin/rtmp_source_bin_test.exs        | 2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)
 rename lib/membrane_rtmp_plugin/rtmp/source/{source_client_handler.ex => client_handler_for_source.ex} (88%)

diff --git a/examples/source_with_standalone_server.exs b/examples/source_with_standalone_server.exs
index 4cef8924..02de8800 100644
--- a/examples/source_with_standalone_server.exs
+++ b/examples/source_with_standalone_server.exs
@@ -58,7 +58,7 @@ end
 # Run the standalone server
 {:ok, server} =
   Membrane.RTMP.Server.start_link(
-    handler: %Membrane.RTMP.Source.ClientHandler{controlling_process: self()},
+    handler: %Membrane.RTMP.Source.ClientHandlerForSource{controlling_process: self()},
     port: port,
     use_ssl?: false,
     new_client_callback: new_client_callback,
diff --git a/lib/membrane_rtmp_plugin/rtmp/source/source_client_handler.ex b/lib/membrane_rtmp_plugin/rtmp/source/client_handler_for_source.ex
similarity index 88%
rename from lib/membrane_rtmp_plugin/rtmp/source/source_client_handler.ex
rename to lib/membrane_rtmp_plugin/rtmp/source/client_handler_for_source.ex
index 617d7350..7c554675 100644
--- a/lib/membrane_rtmp_plugin/rtmp/source/source_client_handler.ex
+++ b/lib/membrane_rtmp_plugin/rtmp/source/client_handler_for_source.ex
@@ -1,4 +1,4 @@
-defmodule Membrane.RTMP.Source.SourceClientHandler do
+defmodule Membrane.RTMP.Source.ClientHandlerForSource do
   @moduledoc """
   An implementation of `Membrane.RTMP.Server.ClienHandlerBehaviour` compatible with the
   `Membrane.RTMP.Source` element.
@@ -67,10 +67,4 @@ defmodule Membrane.RTMP.Source.SourceClientHandler do
     send(pid, :end_of_stream)
     :ok
   end
-
-  @spec request_for_data(pid()) :: :ok
-  def request_for_data(client_reference) do
-    send(client_reference, {:send_me_data, self()})
-    :ok
-  end
 end
diff --git a/lib/membrane_rtmp_plugin/rtmp/source/source.ex b/lib/membrane_rtmp_plugin/rtmp/source/source.ex
index 1cf4f3ee..853ac345 100644
--- a/lib/membrane_rtmp_plugin/rtmp/source/source.ex
+++ b/lib/membrane_rtmp_plugin/rtmp/source/source.ex
@@ -13,7 +13,6 @@ defmodule Membrane.RTMP.Source do
   use Membrane.Source
   require Membrane.Logger
   require Logger
-  alias __MODULE__.SourceClientHandler
   alias Membrane.RTMP.Server.ClientHandler
 
   def_output_pad :output,
@@ -91,7 +90,7 @@ defmodule Membrane.RTMP.Source do
 
     {:ok, server_pid} =
       Membrane.RTMP.Server.start_link(
-        handler: %SourceClientHandler{controlling_process: self()},
+        handler: %__MODULE__.ClientHandlerForSource{controlling_process: self()},
         port: port,
         use_ssl?: use_ssl?,
         new_client_callback: new_client_callback,
@@ -114,7 +113,7 @@ defmodule Membrane.RTMP.Source do
         {:output, %Membrane.RemoteStream{content_format: Membrane.FLV, type: :bytestream}}
     ]
 
-    :ok = SourceClientHandler.request_for_data(state.client_ref)
+    send(state.client_ref, {:send_me_data, self()})
 
     {stream_format, state}
   end
@@ -149,7 +148,7 @@ defmodule Membrane.RTMP.Source do
         %{client_ref: client_ref, mode: :builtin_server} = state
       ) do
     :ok = ClientHandler.demand_data(client_ref, size)
-    :ok = SourceClientHandler.request_for_data(client_ref)
+    send(client_ref, {:send_me_data, self()})
     {[], state}
   end
 
diff --git a/test/membrane_rtmp_plugin/rtmp_source_bin_test.exs b/test/membrane_rtmp_plugin/rtmp_source_bin_test.exs
index 44ebf096..d78543d8 100644
--- a/test/membrane_rtmp_plugin/rtmp_source_bin_test.exs
+++ b/test/membrane_rtmp_plugin/rtmp_source_bin_test.exs
@@ -226,7 +226,7 @@ defmodule Membrane.RTMP.SourceBin.IntegrationTest do
 
     {:ok, server_pid} =
       Membrane.RTMP.Server.start_link(
-        handler: %Membrane.RTMP.Source.ClientHandler{
+        handler: %Membrane.RTMP.Source.ClientHandlerForSource{
           controlling_process: self()
         },
         port: port,