Refactor namespace

membraneframework · Aug 7, 2024 · f3c6ac2 · f3c6ac2
1 parent 7d511b7
commit f3c6ac2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git 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/...ugin/rtmp/source/source_client_handler.ex → .../rtmp/source/client_handler_for_source.ex b/...ugin/rtmp/source/source_client_handler.ex → .../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
@@ -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
@@ -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,