From 3d768f3af84eece72e8b8a4683b069278edaa280 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 2 Nov 2015 19:11:22 +0100 Subject: Rename make_call into dial --- src/dial.erl | 14 ++++++++++++++ src/make_call.erl | 14 -------------- src/rose.erl | 2 +- src/tda.erl | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/dial.erl delete mode 100644 src/make_call.erl (limited to 'src') diff --git a/src/dial.erl b/src/dial.erl new file mode 100644 index 0000000..4fd981e --- /dev/null +++ b/src/dial.erl @@ -0,0 +1,14 @@ +-module(dial). + +-export([decode/1, encode/2]). + +-include("CSTA-make-call.hrl"). +-include("CSTA-device-identifiers.hrl"). + +decode(Data) -> + 'CSTA-make-call':decode('MakeCallResult', Data). + +encode(From, To) -> + 'CSTA-make-call':encode('MakeCallArgument', #'MakeCallArgument'{ + callingDevice = #'DeviceID'{ deviceIdentifier = From }, + calledDirectoryNumber = #'DeviceID'{ deviceIdentifier = To }}). diff --git a/src/make_call.erl b/src/make_call.erl deleted file mode 100644 index 46d1dc8..0000000 --- a/src/make_call.erl +++ /dev/null @@ -1,14 +0,0 @@ --module(make_call). - --export([decode/1, encode/2]). - --include("CSTA-make-call.hrl"). --include("CSTA-device-identifiers.hrl"). - -decode(Data) -> - 'CSTA-make-call':decode('MakeCallResult', Data). - -encode(From, To) -> - 'CSTA-make-call':encode('MakeCallArgument', #'MakeCallArgument'{ - callingDevice = #'DeviceID'{ deviceIdentifier = From }, - calledDirectoryNumber = #'DeviceID'{ deviceIdentifier = To }}). diff --git a/src/rose.erl b/src/rose.erl index 6ec035a..4b671f5 100644 --- a/src/rose.erl +++ b/src/rose.erl @@ -59,7 +59,7 @@ dispatch({reject, #'Reject'{invokeId = Id, problem = Problem}}) -> dispatch(#'ReturnResult_result'{opcode = Op, result = Data}) -> case Op of ?MAKECALL -> - {ok, Result} = make_call:decode(Data), + {ok, Result} = dial:decode(Data), io:format("Make call: ~p~n", [Result]); ?BUTTON -> {ok, List} = button:decode(Data), diff --git a/src/tda.erl b/src/tda.erl index dd6e3ae..0fcc9d3 100644 --- a/src/tda.erl +++ b/src/tda.erl @@ -1,7 +1,7 @@ -module(tda). -export([start/0, client/1, stop/0, decode/1]). --export([send/1, ext/0, co/0, snapshot/1, monitor/1, button/1, make_call/2]). +-export([send/1, ext/0, co/0, snapshot/1, monitor/1, button/1, dial/2]). -include("config.hrl"). -include("opcodes.hrl"). @@ -31,8 +31,8 @@ button(Device) -> monitor(Device) -> ?MODULE ! rose:invoke(?MONITOR, monitor:encode({dialingNumber, Device})). -make_call(From, To) -> - ?MODULE ! rose:invoke(?MAKECALL, make_call:encode({dialingNumber, From}, {dialingNumber, To})). +dial(From, To) -> + ?MODULE ! rose:invoke(?MAKECALL, dial:encode({dialingNumber, From}, {dialingNumber, To})). client({dial, Host, Port}) -> io:format("Dial ~p:~p~n", [Host, Port]), -- cgit v1.2.3