Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1314] trunk/plugins/AsteriskCallerID
|
From: <gre...@us...> - 2008-01-26 15:41:47
|
Revision: 1314
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1314&view=rev
Author: gregorvsf
Date: 2008-01-26 07:41:27 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/AsteriskCallerID/ACID/AsteriskCID.cs
trunk/plugins/AsteriskCallerID/ACID/CallWatch.cs
trunk/plugins/AsteriskCallerID/ACID.suo
trunk/plugins/AsteriskCallerID/doc/Maual Asterisk Caller ID plugin for MediaPortal.doc
Added Paths:
-----------
trunk/plugins/AsteriskCallerID/doc/ReleaseNotes.txt
Property Changed:
----------------
trunk/plugins/AsteriskCallerID/ACID/
trunk/plugins/AsteriskCallerID/References/
Property changes on: trunk/plugins/AsteriskCallerID/ACID
___________________________________________________________________
Name: svn:ignore
+ bin
obj
Modified: trunk/plugins/AsteriskCallerID/ACID/AsteriskCID.cs
===================================================================
--- trunk/plugins/AsteriskCallerID/ACID/AsteriskCID.cs 2008-01-26 00:02:47 UTC (rev 1313)
+++ trunk/plugins/AsteriskCallerID/ACID/AsteriskCID.cs 2008-01-26 15:41:27 UTC (rev 1314)
@@ -53,7 +53,7 @@
#region Variables/Constants
// plugin constants
- const string _version = "0.2.1.0";
+ const string _version = "0.2.1.1";
const string _author = "Troky/GregorV";
const string _name = "AsteriskCID";
const string _description = "Displays Asterisk CallerId";
@@ -110,6 +110,7 @@
CallWatch.RemoveLeadingDigit = xmlreader.GetValueAsBool("AsteriskCID", "RemoveLeadingDigit", false);
CallWatch.LeadingDigit = xmlreader.GetValueAsInt("AsteriskCID", "LeadingDigit", 0);
CallWatch.timeOut = xmlreader.GetValueAsInt("AsteriskCID", "NotifyTimeout", 0);
+ CallWatch.ConnectString = xmlreader.GetValueAsString("AsteriskCID", "ConnectString", "");
}
}
Modified: trunk/plugins/AsteriskCallerID/ACID/CallWatch.cs
===================================================================
--- trunk/plugins/AsteriskCallerID/ACID/CallWatch.cs 2008-01-26 00:02:47 UTC (rev 1313)
+++ trunk/plugins/AsteriskCallerID/ACID/CallWatch.cs 2008-01-26 15:41:27 UTC (rev 1314)
@@ -44,6 +44,7 @@
public static int timeOut = -1; // autoclose the dialog after the timeout expired
public static bool RemoveLeadingDigit = false; // flag to remove or not the leading digit from CID
public static int LeadingDigit = 0; // the leading digit can be set to 0 or 9
+ public static string ConnectString = String.Empty; // string for 'Connected' message (not in lang.xml)
static string TrunkInfo = String.Empty; // used to filter multiple messages for one call
static int CallStatus = 0;
public static AsteriskManager ast=null; // Asterisk.NET interface
@@ -100,6 +101,9 @@
dialogNotify.DoModal(GUIWindowManager.ActiveWindow); // show Notify Window
// funktion stops here, until Window is closed
+ CallWatch.CallStatus = 0; // set callstatus to 'no call'
+ CallWatch.TrunkInfo = string.Empty; // clear trunk info from last call
+ CallWatch.IsShown = false; // clear show flag
if (dialogNotify.IsVisible) // by timeout or OK click or closeWindow called
{
if (debuglevel >= 2)
@@ -109,9 +113,6 @@
if (debuglevel >= 2)
Log.Info("AsteriskCID: Resume playback"); // debuglevel 2 log
MediaPortal.Player.g_Player.Pause(); // continue play media
- CallWatch.CallStatus = 0; // set callstatus to 'no call'
- CallWatch.TrunkInfo = string.Empty; // clear trunk info from last call
- CallWatch.IsShown = false; // clear show flag
}
}
}
@@ -142,8 +143,15 @@
static void OnLink(object sender, Asterisk.NET.Manager.Event.LinkEvent e) // this should occur only once
{
- string notifyText = GUILocalizeStrings.Get(909); // 909="Connecting..." (from strings_[country].xml
-
+ string notifyText;
+ if (ConnectString == String.Empty) // if no connect string configured (MediaPortal.xml)
+ {
+ notifyText = GUILocalizeStrings.Get(909); // 909="Connecting..." (from strings_[country].xml
+ }
+ else
+ {
+ notifyText = ConnectString;
+ }
if (debuglevel >= 2)
Log.Info("AsteriskCID: OnLink() event"); // debuglevel 2 log
if (CallWatch.CheckFilter(e.Channel1, Channels, Extensions, 2)) // check if event should be ignored
@@ -264,8 +272,10 @@
if (r.IsMatch(str)) // then we need to do nothing
{
if (debuglevel >= 3)
+ {
Log.Info("AsteriskCID: skip event, Extension(" + Efilter + ") found:" + str); // debuglevel 3 log
- return false; // return false
+ return false; // return false
+ }
}
}
@@ -314,8 +324,8 @@
// be retrieved from the web, then the name is set to
// "NA phonenumber", so we look for an image NA.jpg
- if ((name == "<unknown>") || (name == "XX")) // for standard configuration and if anomymous calls
- name = "unknown"; // set the name to "XX" we look for image unknown.jpg
+ if ((name == "<unknown>") || (name == "XXX")) // for standard configuration and if anomymous calls
+ name = "unknown"; // set the name to "XXX" we look for image unknown.jpg
string strImage = MediaPortal.Util.Utils.GetCoverArtName(Thumbs.Yac, name); // get image path
if (File.Exists(strImage)) // if the image file exists
return strImage; // return the image path
Modified: trunk/plugins/AsteriskCallerID/ACID.suo
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AsteriskCallerID/References
___________________________________________________________________
Name: svn:ignore
+ Bass.Net.dll
Core.dll
Dialogs.dll
Utils.dll
WindowPlugins.dll
Modified: trunk/plugins/AsteriskCallerID/doc/Maual Asterisk Caller ID plugin for MediaPortal.doc
===================================================================
(Binary files differ)
Added: trunk/plugins/AsteriskCallerID/doc/ReleaseNotes.txt
===================================================================
--- trunk/plugins/AsteriskCallerID/doc/ReleaseNotes.txt (rev 0)
+++ trunk/plugins/AsteriskCallerID/doc/ReleaseNotes.txt 2008-01-26 15:41:27 UTC (rev 1314)
@@ -0,0 +1,15 @@
+Release 0.2.1.1 / 26.1.2008
+Fixes:
+In some scenarios it could happen that the call memory was not cleared. All following calls did not show a popup.
+Also for outbound calls that were not shown because of filtered extensions it could happen that such calls could create an entry into the call memory and so blocking messages for incomming calls.
+
+New:
+For the connect message there is no string defined in the lang_xx.xml and a German language message was hard coded.
+
+Now the user has the choice either to configure his own connect message string by adding it manually to the MP configuration file.
+Add the following line in the AsteriskCID section:
+ <entry name="ConnectString">Connected to:</entry>
+"Connected to:" is the message that appears together with the extension if someone establishes the call.
+
+If this option is empty or does not exist, then the string with ID=909 is shown (for English it is: "Connecting..."). This one is the best existing match in the language files.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|