Fix error messages (#49)

* Fix error messages

* Bump version to v0.16.2

* Bump deps

* Bump cache version

* Remove usage of deprecated functions

* unlock unused deps

.circleci/config.yml

@@ -7,16 +7,20 @@ workflows:
   build:
     jobs:
       - elixir/build_test:
+          cache-version: 3
           filters: &filters
             tags:
               only: /v.*/
       - elixir/test:
+          cache-version: 3
           filters:
             <<: *filters
       - elixir/lint:
+          cache-version: 3
           filters:
             <<: *filters
       - elixir/hex_publish:
+          cache-version: 3
           requires:
             - elixir/build_test
             - elixir/test

README.md

@@ -27,7 +27,7 @@ sudo apt-get install libmad0-dev
 Then, add the following line to your `deps` in `mix.exs`:
 
 ```elixir
-	{:membrane_audio_mix_plugin, "~> 0.16.1"}
+	{:membrane_audio_mix_plugin, "~> 0.16.2"}
 ```
 
 and run `mix deps.get`.

lib/membrane_live_audio_mixer/live_queue.ex

@@ -40,7 +40,8 @@ defmodule Membrane.LiveAudioMixer.LiveQueue do
   def add_queue(lq, id, offset \\ 0)
 
   def add_queue(lq, id, offset) when offset >= 0 do
-    if get_in(lq, [:queues, id]) != nil, do: raise("Queue with id: '#{id}' already exists.")
+    if get_in(lq, [:queues, id]) != nil,
+      do: raise("Queue with id: '#{inspect(id)}' already exists.")
 
     queue = %Queue{offset: offset}
     put_in(lq, [:queues, id], queue)
@@ -54,13 +55,14 @@ defmodule Membrane.LiveAudioMixer.LiveQueue do
   """
   @spec remove_queue(t(), any()) :: t()
   def remove_queue(lq, id) do
-    if not Map.has_key?(lq.queues, id), do: raise("Queue with id: '#{id}' doesn't exists")
+    if not Map.has_key?(lq.queues, id),
+      do: raise("Queue with id: '#{inspect(id)}' doesn't exists")
 
     queue = lq.queues[id]
 
     cond do
       queue.draining? ->
-        raise "Queue with id: '#{id}' is already marked as draining"
+        raise "Queue with id: '#{inspect(id)}' is already marked as draining"
 
       queue.buffer_duration == 0 ->
         {_queue, lq} = pop_in(lq, [:queues, id])

mix.exs

@@ -1,7 +1,7 @@
 defmodule Membrane.AudioMix.Mixfile do
   use Mix.Project
 
-  @version "0.16.1"
+  @version "0.16.2"
   @github_url "https://github.com/membraneframework/membrane_audio_mix_plugin"
 
   def project do

test/mixer/common_mixer_test.exs

@@ -428,7 +428,7 @@ defmodule Membrane.CommonMixerTest do
   defp do_perform_test(spec, reference_path, output_path, true) do
     assert pipeline = Pipeline.start_link_supervised!(spec: spec)
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
 
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 

test/mixer/live_mixer_test.exs

@@ -52,13 +52,13 @@ defmodule Membrane.LiveAudioMixerTest do
 
     assert pipeline = Pipeline.start_link_supervised!(spec: spec)
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
 
     spec = add_audio_source(2)
 
     Pipeline.execute_actions(pipeline, spec: spec)
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     check_output_duration(output_path)
@@ -76,14 +76,14 @@ defmodule Membrane.LiveAudioMixerTest do
     ]
 
     assert pipeline = Pipeline.start_link_supervised!(spec: spec)
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
 
     spec = add_audio_source(1) ++ add_audio_source(2)
 
     Pipeline.execute_actions(pipeline, spec: spec)
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     check_output_duration(output_path)
@@ -98,7 +98,7 @@ defmodule Membrane.LiveAudioMixerTest do
     links = create_links()
 
     assert pipeline = Pipeline.start_link_supervised!(spec: elements ++ links)
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     spec = add_audio_source(3)
@@ -132,7 +132,7 @@ defmodule Membrane.LiveAudioMixerTest do
 
     assert pipeline = Pipeline.start_link_supervised!(spec: spec)
 
-    Pipeline.message_child(pipeline, :mixer, {:start_mixing, 0})
+    Pipeline.notify_child(pipeline, :mixer, {:start_mixing, 0})
 
     # audio duration has to be equal or longer than 15 seconds
     # input audio has 10 seconds
@@ -145,7 +145,7 @@ defmodule Membrane.LiveAudioMixerTest do
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     check_output_duration(output_path, 15)
@@ -170,9 +170,9 @@ defmodule Membrane.LiveAudioMixerTest do
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
 
-    Pipeline.message_child(pipeline, :mixer, {:start_mixing, 0})
+    Pipeline.notify_child(pipeline, :mixer, {:start_mixing, 0})
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     check_output_duration(output_path)
@@ -194,13 +194,13 @@ defmodule Membrane.LiveAudioMixerTest do
     # time for the pipeline to enter playing playback
     Process.sleep(100)
 
-    Pipeline.message_child(pipeline, :mixer, {:start_mixing, 0})
+    Pipeline.notify_child(pipeline, :mixer, {:start_mixing, 0})
 
     # audio duration has to be equal or longer than 5 seconds
     # thats why sleep is a little longer than 5 seconds
     Process.sleep(5_300)
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
 
     assert_end_of_stream(pipeline, :file_sink, :input, 1_000)
 
@@ -220,12 +220,12 @@ defmodule Membrane.LiveAudioMixerTest do
 
     assert pipeline = Pipeline.start_link_supervised!(spec: spec)
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
 
     spec = add_audio_source(1) ++ add_audio_source(2)
     Pipeline.execute_actions(pipeline, spec: spec)
 
-    Pipeline.message_child(pipeline, :mixer, {:start_mixing, 0})
+    Pipeline.notify_child(pipeline, :mixer, {:start_mixing, 0})
 
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
@@ -253,7 +253,7 @@ defmodule Membrane.LiveAudioMixerTest do
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 1))
     assert_start_of_stream(pipeline, :mixer, Pad.ref(:input, 2))
 
-    Pipeline.message_child(pipeline, :mixer, :schedule_eos)
+    Pipeline.notify_child(pipeline, :mixer, :schedule_eos)
     assert_end_of_stream(pipeline, :file_sink, :input, 20_000)
 
     check_output_duration(output_path)