<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 9ff716208ae05c3e9cb55d639243371e8553bb17 (commit)
via: 93112a4f782c3e44108439e6fdeb7789482735d4 (commit)
via: 32250fa69ff8b942ca99c4eaabafde285cc27c9a (commit)
via: b98a258f545eea7976d80c2bb6450a73caa9dd3c (commit)
via: 55ef55a5a9e951b26c52b3d2f0e5f902e568f1f9 (commit)
via: ca8489d71e127d5ff7beafbd91bcf5f9c683dd8d (commit)
via: 0cb41713987185aec7f42c9cff174b6d2757e460 (commit)
via: c2e63f1d8fc269cf17bd85d534c9099af8a454b6 (commit)
via: ee436d35144c7d85629d2c7356db64d5f392d1ff (commit)
via: abd1a5786ac8079d735ede53515dbaedd8324acd (commit)
via: d850c3f8a176e25142ee03cf316f4f19204837ea (commit)
via: c780da02444472e37aee420dbb3087c232094d4e (commit)
via: 90edbdd8fa5095b59024bbe41e3291c460d5a929 (commit)
via: d9ed290a32fd5dfd4401b02652e07c892126d7c6 (commit)
via: 0ad7de6241a7ed8f208ce82cfe39e27ba3a848ac (commit)
via: 078d663ef932223e27db8166e074cc4f4542a339 (commit)
via: 4bebf82901b579b38a58642bf4e409db912f33bb (commit)
via: 0d3117dc3c66448cd5b7f5219198d57865329619 (commit)
via: 7342c77d10810960f49fc5213db4a23dc203fd7a (commit)
via: 9ecdde39b5fb94c4708b530a7c90e82900ff15ed (commit)
via: 69415c934e4b3dc70b22816aa847706336c442f5 (commit)
via: 8b7b83f0a42fc7cce5deaacd1c3a56f76c392175 (commit)
via: 7f89d85adb464f103abda4c3cee75a10f9515921 (commit)
via: 68d384edcbabcac7e4058bbf26f409817d2c4505 (commit)
via: f763d39469b5e2c75ca9ba0ce3aa702cd31d02ab (commit)
via: 9d2159f50948fd24df3a8bd2cfca6b134fb06643 (commit)
via: 215d28aad12526e59f86e03e62b4a44def0bb0c9 (commit)
via: 24d4ad4efc9304067e70ef087ff723b9d996c49c (commit)
via: f242d90a8febb1151c3e52998e3af08780345026 (commit)
via: 6ca02e4ccb7d608a626e21141c8addd140b71a8e (commit)
via: 2d3389c92b55f5e357347a78d00f11c3a39095c3 (commit)
via: 12fdbfc7fdc9250384678c220f83c18750e1c7a5 (commit)
via: 05607e2921107e506212e5dc4682f741e5a2094d (commit)
via: dd717e22ac45a6f98df556058eb7f86f98e2f529 (commit)
via: d9b852ba104ca8ae88795008c476c9938a14e60d (commit)
via: 6c763424234f10968f440d663e4ee484d221fe32 (commit)
via: c0c365936eab87719433e1e96c4fbf4adf7c9e47 (commit)
via: eadf3dc00f690257a7ee04949bc5b676cb6b622f (commit)
via: 729cc6d3ea25ff83efa9f1cb344cf066eee69efe (commit)
via: d55d498c5d54b30055551e683d5e28b6bf2253f8 (commit)
via: 44e02296787e6776b62d528872eed216c8835fc6 (commit)
via: 2136632a9d3d3210edcb0296616b51f093505809 (commit)
via: 577fc9ba2ce176c24897eac5382d4c8239f204f0 (commit)
via: c79712dc7b6516c7cf866566558bd90a8b3019f8 (commit)
via: 3fda7b4ada645ac361dac8e55ac7cafe94ae7287 (commit)
via: 3d9d46652b597fd6360129de9c986491a58c5610 (commit)
via: 12801e42e4655416b73cb7a206c60e5c66d34e10 (commit)
via: d2a9bb867d3c01d38ea12fa655b65ad68c0b24e0 (commit)
via: faf08b1841ee3f0807afd3d886066aeb3776f739 (commit)
via: 0405d1fb7209050a0fa1cc0718c0aeee61191a95 (commit)
via: 7896938aefaf21adc42a01b4d8e9dd3d42ffbc82 (commit)
via: 9c0deb98bbc4aa6a9e5e6f792e911b550f4db83f (commit)
via: 0bff16bee499925e83339750a0ce5c1386fc0048 (commit)
via: 9858ca1c2a2fda5d56f268a6e359e207eedde6ab (commit)
via: 98ea43c3681dd0263dcf027aef3437732e0682e1 (commit)
via: 9aa2f07c369938230c5c4b8b61b67b1c53749efe (commit)
via: cfaca250a7c49387abd98ef3fbd7124efb02d422 (commit)
via: b6c998685330b7c689cd08726438271ac68f0361 (commit)
via: 75bbd885eb1eef0bcfea9b5371557823ca584522 (commit)
via: 274a7dd627ab98012ebf26c68c0ed5f440fa9033 (commit)
via: 2bd0da508187e942e4c906275e286cefedb3a62e (commit)
via: 48590eca54e7c93ef987768a24a844dfd72986d1 (commit)
via: 594536af195a45e9515ff1c40979a3f036934e49 (commit)
via: 4a414482ddc08fe77a42daab560a1bd860235154 (commit)
via: 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit)
via: fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit)
via: 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa (commit)
via: 5247b0c1000e9aa6e642cdd238396d679d7c6bb3 (commit)
via: 09778f943674b470c51a636aa8e3e3b22589708e (commit)
via: 007d9a09df8e52d540e46eb009b44f69121fc275 (commit)
via: f3c9f291d9c4854ff8c17e81552d9ed2a4c3b1e5 (commit)
via: 9815e2a0df6b765a401a8572abffd9fdaebc7445 (commit)
via: 39a9310bb19111abd30bc321486131ee6c192419 (commit)
via: e2b54d344ba3c45ad021c55c622de2435d26f760 (commit)
via: ad1abfb06540e554b8798fd1569576e5324ee4f1 (commit)
via: dba9490db801a8203ae10be142cfe9cc52c467da (commit)
via: 88e84105b037d43dbbeef108fceb97f83d1e758a (commit)
via: e0701b3b4cfc9b24182a649ab4b9c7831d35deda (commit)
via: 30bc2ff4614fd7c90f7fa09ff70fc1d8cad60d0b (commit)
via: 41614caf79c0f8b391edb387c5fa956b2b04779e (commit)
via: 093784f337adf048e03b8532ce2f6a05f1c508ee (commit)
via: 2099249f0382f35538438dd7aa8e8d66a0524acf (commit)
via: b01aff5a42c014303620a0c91e2c2ab7445b7b58 (commit)
via: 4d72a146079811b6082465e83b78b5ea75c37f14 (commit)
from: a4349bbeba56858b0c17f8b69ed69ecebba0bc58 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Chad Phillips
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Added option to delete contacts
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #000080; font-weight: bold">index 3c1b33b..66c3918 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #800080; font-weight: bold">@@ -23,6 +23,12 @@ namespace FSClient</span>
{
return number;
}
<span style="color: #00A000">+ protected virtual void DeleteNumber(string number){</span>
<span style="color: #00A000">+ number_to_alias.Remove(number);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ protected virtual bool CanDeleteContact(){</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
protected virtual string IsValidAlias(String str)//return null to abort updating, otherwire return string
{
return str;
<span style="color: #800080; font-weight: bold">@@ -49,14 +55,34 @@ namespace FSClient</span>
MenuItem item = new MenuItem();
item.Click += item_Click;
item.Header = "Edit Contact";
<span style="color: #A00000">- items.Add(item);</span>
<span style="color: #00A000">+ items.Add(item);</span>
<span style="color: #00A000">+ if (CanDeleteContact()){</span>
<span style="color: #00A000">+ item = new MenuItem();</span>
<span style="color: #00A000">+ item.Click += delete_item_click;</span>
<span style="color: #00A000">+ item.Header = "Delete Contact";</span>
<span style="color: #00A000">+ items.Add(item);</span>
<span style="color: #00A000">+ }</span>
item = new MenuItem();
item.Click +=contact_call_click;
item.Header = "Call";
items.Add(item);
return items;
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ private void delete_item_click(object sender, RoutedEventArgs e){</span>
<span style="color: #00A000">+ MenuItem item = sender as MenuItem;</span>
<span style="color: #00A000">+ if (item == null)</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry;</span>
<span style="color: #00A000">+ if (entry == null)</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ String number = entry.number;</span>
<span style="color: #00A000">+ number = NormalizeNumber(number);</span>
<span style="color: #00A000">+ DeleteNumber(number);</span>
<span style="color: #00A000">+ refresh_search_box();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
private void contact_call_click(object sender, RoutedEventArgs e){
MenuItem item = sender as MenuItem;
if (item == null)
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #000080; font-weight: bold">index 55da854..3077954 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #800080; font-weight: bold">@@ -88,6 +88,10 @@ namespace SimpleXmlContactPlugin {</span>
protected override void UpdateDatabase(string number, string alias){
SaveDatabase();
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ protected override void DeleteNumber(string number) {</span>
<span style="color: #00A000">+ base.DeleteNumber(number);</span>
<span style="color: #00A000">+ SaveDatabase();</span>
}
}
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBortha: fix HTML form (hidden fields)
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #000080; font-weight: bold">index 1c0454a..feb98e8 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #800080; font-weight: bold">@@ -137,23 +137,28 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
foreach($form as $field) {
if ($field->get('visibility') === 'hidden') {
<span style="color: #A00000">- continue;</span>
<span style="color: #00A000">+ $inputElement = $this->_xml->createElement('input');</span>
<span style="color: #00A000">+ $inputElement = $formElement->appendChild($inputElement);</span>
<span style="color: #00A000">+ $inputElement->setAttribute('name', $field->get('name'));</span>
<span style="color: #00A000">+ $inputElement->setAttribute('value', $field->get('value'));</span>
<span style="color: #00A000">+ $inputElement->setAttribute('type', 'hidden');</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $trElement = $this->_xml->createElement('tr');</span>
<span style="color: #00A000">+ $trElement = $tableElement->appendChild($trElement);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tdElement1 = $this->_xml->createElement('th');</span>
<span style="color: #00A000">+ $tdElement1 = $trElement->appendChild($tdElement1);</span>
<span style="color: #00A000">+ $text1 = $this->_xml->createTextNode($field->get('display_name'));</span>
<span style="color: #00A000">+ $text1 = $tdElement1->appendChild($text1);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tdElement2 = $this->_xml->createElement('td');</span>
<span style="color: #00A000">+ $tdElement2 = $trElement->appendChild($tdElement2);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $inputElement = $this->_xml->createElement('input');</span>
<span style="color: #00A000">+ $inputElement = $tdElement2->appendChild($inputElement);</span>
<span style="color: #00A000">+ $inputElement->setAttribute('name', $field->get('name'));</span>
<span style="color: #00A000">+ $inputElement->setAttribute('value', $field->get('value'));</span>
}
<span style="color: #A00000">- $trElement = $this->_xml->createElement('tr');</span>
<span style="color: #A00000">- $trElement = $tableElement->appendChild($trElement);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- $tdElement1 = $this->_xml->createElement('th');</span>
<span style="color: #A00000">- $tdElement1 = $trElement->appendChild($tdElement1);</span>
<span style="color: #A00000">- $text1 = $this->_xml->createTextNode($field->get('display_name'));</span>
<span style="color: #A00000">- $text1 = $tdElement1->appendChild($text1);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- $tdElement2 = $this->_xml->createElement('td');</span>
<span style="color: #A00000">- $tdElement2 = $trElement->appendChild($tdElement2);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- $inputElement = $this->_xml->createElement('input');</span>
<span style="color: #A00000">- $inputElement = $tdElement2->appendChild($inputElement);</span>
<span style="color: #A00000">- $inputElement->setAttribute('name', $field->get('name'));</span>
<span style="color: #A00000">- $inputElement->setAttribute('value', $field->get('value'));</span>
}
$trElement = $this->_xml->createElement('tr');
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: LDAP search and result
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #000080; font-weight: bold">index 2b04351..a1a0e98 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #800080; font-weight: bold">@@ -50,16 +50,22 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
// Browsing
public function mediaFromBufferItem($entry) {
<span style="color: #A00000">- if ($entry) {</span>
<span style="color: #A00000">- $media = new MediaBrotha_Media(</span>
<span style="color: #00A000">+ if (is_a($entry, 'Net_LDAP2_Entry')) {</span>
<span style="color: #00A000">+ return new MediaBrotha_Media(</span>
'ldap:///'.$entry->dn(),
Array(
'display_name' => $entry->dn(), //$entry->getValue('sn', 'single'),
),
'text/directory'
<span style="color: #A00000">- //$finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING);</span>
);
<span style="color: #A00000">- return $media;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return new MediaBrotha_Media(</span>
<span style="color: #00A000">+ 'ldap:///',</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'display_name' => $entry[0].': '.$entry[1],</span>
<span style="color: #00A000">+ ),</span>
<span style="color: #00A000">+ 'text/directory'</span>
<span style="color: #00A000">+ );</span>
}
}
<span style="color: #800080; font-weight: bold">@@ -73,8 +79,10 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
if ($this->_isHandled($media)) {
return Array(
'_default',
<span style="color: #00A000">+ 'detail',</span>
'browse',
'search',
<span style="color: #00A000">+ '_search-result',</span>
);
} else {
return parent::getMediaActions($media);
<span style="color: #800080; font-weight: bold">@@ -92,13 +100,48 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
if ($basedn && ($basedn{0} = '/')) {
$basedn = substr($basedn, 1);
}
<span style="color: #A00000">- $ldap_search = $this->_ldap->search($basedn, NULL,</span>
<span style="color: #A00000">- Array());</span>
<span style="color: #00A000">+ $ldap_search = $this->_ldap->search($basedn, NULL, Array());</span>
return new MediaBrotha_MediaIterator($this, $ldap_search);
<span style="color: #00A000">+ case 'detail':</span>
<span style="color: #00A000">+ $uri = $media->getURI();</span>
<span style="color: #00A000">+ if (($this::parseLDAPURI($uri, PHP_URL_SCHEME) != 'ldap') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $basedn = $this::parseLDAPURI($uri, PHP_URL_PATH);</span>
<span style="color: #00A000">+ if ($basedn && ($basedn{0} = '/')) {</span>
<span style="color: #00A000">+ $basedn = substr($basedn, 1);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $ldap_entry = $this->_ldap->getEntry($basedn);</span>
<span style="color: #00A000">+ $it = new ArrayIterator();</span>
<span style="color: #00A000">+ foreach ($ldap_entry->attributes() as $attr) {</span>
<span style="color: #00A000">+ foreach($ldap_entry->getValue($attr, 'all') as $value) {</span>
<span style="color: #00A000">+ $it[] = Array($attr, $value);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, $it);</span>
case '_default':
case 'search':
<span style="color: #00A000">+ case '_search-result':</span>
$form = new MediaBrotha_Form();
$form->setTitle('search');
<span style="color: #00A000">+ $form->addField(Array(</span>
<span style="color: #00A000">+ 'name' => 'backend',</span>
<span style="color: #00A000">+ 'value' => 'LDAP',</span>
<span style="color: #00A000">+ 'visibility' => 'hidden',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ $form->addField(Array(</span>
<span style="color: #00A000">+ 'name' => 'action',</span>
<span style="color: #00A000">+ 'value' => '_search-result',</span>
<span style="color: #00A000">+ 'visibility' => 'hidden',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ $form->addField(Array(</span>
<span style="color: #00A000">+ 'name' => 'uri',</span>
<span style="color: #00A000">+ 'value' => 'ldap://',</span>
<span style="color: #00A000">+ 'visibility' => 'hidden',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
$search_fields = Array(
'sn' => Array('display_name' => 'last name'),
'givenName' => Array('display_name' => 'first name'),
<span style="color: #800080; font-weight: bold">@@ -124,22 +167,15 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
}
$form->addField($field);
}
<span style="color: #A00000">- if (empty($_GET['ldap_search'])) {</span>
<span style="color: #A00000">- MediaBrotha_Core::addCallback('MediaBrotha_Backend_LDAP::searchCallback');</span>
<span style="color: #00A000">+ if ($action !== '_search-result') {</span>
return $form;
} else {
<span style="color: #A00000">- $ldap_search = $this->_ldap->search(NULL, $filter,</span>
<span style="color: #A00000">- Array('scope' => 'sub'));</span>
<span style="color: #00A000">+ $ldap_search = $this->_ldap->search(NULL, $filter, Array('scope' => 'sub'));</span>
return new MediaBrotha_MediaIterator($this, $ldap_search);
}
default:
return parent::doMediaAction($action, $media);
}
}
<span style="color: #A00000">- static public function searchCallback() {</span>
<span style="color: #A00000">- $_GET['backend'] = 'LDAP';</span>
<span style="color: #A00000">- $_GET['action'] = 'search';</span>
<span style="color: #A00000">- $_GET['ldap_search'] = '1';</span>
<span style="color: #A00000">- }</span>
}
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: avoid error on first connection because of unset session
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index 9e53e13..7758a55 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -202,6 +202,8 @@ class MediaBrotha_Core {</span>
if ($v = MediaBrotha_Core::hash2value($h)) {
parse_str($v, $output);
return $output;
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return Array();</span>
}
}
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: add ability to pass params by using hidden fields
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Form.php b/sathieu/cisco-xml/lib/MediaBrotha/Form.php</span>
<span style="color: #000080; font-weight: bold">index 08dd4c6..509341a 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Form.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Form.php</span>
<span style="color: #800080; font-weight: bold">@@ -40,6 +40,7 @@ class MediaBrotha_Field {</span>
class MediaBrotha_Form extends ArrayIterator {
private $_title;
<span style="color: #00A000">+</span>
public function getTitle() {
return $this->_title;
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index d859829..0f31ee1 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -72,11 +72,20 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
}
public function renderForm(MediaBrotha_Form $form) {
<span style="color: #00A000">+ foreach($form as $field) {</span>
<span style="color: #00A000">+ if ($field->get('visibility') === 'hidden') {</span>
<span style="color: #00A000">+ $params[$field->get('name')] = $field->get('value');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
$xml = new CiscoIPPhoneInput();
$xml->setCiscoElement('Title', $form->getTitle());
//$xml->setCiscoElement('Prompt', ...);
<span style="color: #A00000">- $xml->setCiscoElement('URL', $this->rootURL());</span>
<span style="color: #00A000">+ $xml->setCiscoElement('URL', $this->rootURL().'?'.MediaBrotha_Core::value2hash(http_build_query($params)));</span>
<span style="color: #00A000">+ $params = Array();</span>
foreach($form as $field) {
<span style="color: #00A000">+ if ($field->get('visibility') === 'hidden') {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
$flags = 'A';
$xml->setCiscoElement('InputItem',
Array(
<span style="color: #800080; font-weight: bold">@@ -88,6 +97,19 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
);
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Search',</span>
<span style="color: #00A000">+ 'URL' => 'SoftKey:Submit',</span>
<span style="color: #00A000">+ 'Position' => 1));</span>
<span style="color: #00A000">+ $xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => '<<',</span>
<span style="color: #00A000">+ 'URL' => 'SoftKey:<<',</span>
<span style="color: #00A000">+ 'Position' => 2));</span>
<span style="color: #00A000">+ $xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Exit',</span>
<span style="color: #00A000">+ 'URL' => 'SoftKey:Exit',</span>
<span style="color: #00A000">+ 'Position' => 3));</span>
CiscoXMLObject::HttpHeader();
print $xml;
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #000080; font-weight: bold">index c1ea4df..1c0454a 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #800080; font-weight: bold">@@ -56,6 +56,7 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
private function _createHTMLDocument($title) {
$this->_xml = new DOMDocument('1.0');
<span style="color: #00A000">+ $this->_xml->formatOutput = true;</span>
$root = $this->_xml->createElement('html');
$root = $this->_xml->appendChild($root);
<span style="color: #800080; font-weight: bold">@@ -135,6 +136,9 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
$tableElement = $formElement->appendChild($tableElement);
foreach($form as $field) {
<span style="color: #00A000">+ if ($field->get('visibility') === 'hidden') {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
$trElement = $this->_xml->createElement('tr');
$trElement = $tableElement->appendChild($trElement);
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: add ability to force Cisco-XML mode
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #000080; font-weight: bold">index 0da1cc3..82226f4 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #800080; font-weight: bold">@@ -26,7 +26,7 @@ This file is part of XML services for Cisco IP Phones.</span>
class CiscoIPPhone {
static public function userAgentIsCiscoIPPhone() {
if (isset($_SERVER['HTTP_USER_AGENT'])) {
<span style="color: #A00000">- return preg_match('/^Allegro-Software-WebClient\//', $_SERVER['HTTP_USER_AGENT']);</span>
<span style="color: #00A000">+ return preg_match('/^Allegro-Software-WebClient\//', $_SERVER['HTTP_USER_AGENT']) || isset($_GET['forceciscoxml']);</span>
}
}
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha:
<span style="color: #A00000">- do not display the _default action</span>
<span style="color: #A00000">- ensure session arrays are set</span>
<span style="color: #A00000">- limit MenuItem > Name to 64 chars</span>
<span style="color: #A00000">- Cisco IP Phone need a field flag of 1 char</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #000080; font-weight: bold">index 8e56562..f85b59f 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -67,6 +67,16 @@ abstract class MediaBrotha_Backend {</span>
}
// Actions
<span style="color: #00A000">+ final public function getVisibleMediaActions(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ $actions = Array();</span>
<span style="color: #00A000">+ foreach ($this->getMediaActions($media) as $action) {</span>
<span style="color: #00A000">+ if ($action{0} !== '_') {</span>
<span style="color: #00A000">+ $actions[] = $action;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return $actions;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
public function getMediaActions(MediaBrotha_Media $media) {
return Array();
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index f241c66..9e53e13 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -43,6 +43,12 @@ class MediaBrotha_Core {</span>
if (!session_start()) {
throw new Exception('Unable to start session');
}
<span style="color: #00A000">+ if (!isset($_SESSION['HASHES'])) {</span>
<span style="color: #00A000">+ $_SESSION['HASHES'] = Array();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if (!isset($_SESSION['CALLBACK'])) {</span>
<span style="color: #00A000">+ $_SESSION['CALLBACK'] = Array();</span>
<span style="color: #00A000">+ }</span>
MediaBrotha_Core::_unhashRequest();
MediaBrotha_Core::loadBackend('Root');
} catch (Exception $e) {
<span style="color: #800080; font-weight: bold">@@ -200,9 +206,6 @@ class MediaBrotha_Core {</span>
}
private static function _unhashRequest() {
<span style="color: #A00000">- if (!isset($_SESSION['HASHES'])) {</span>
<span style="color: #A00000">- $_SESSION['HASHES'] = Array();</span>
<span style="color: #A00000">- }</span>
if (isset($_SERVER["QUERY_STRING"])) {
$tmp = explode('&', $_SERVER["QUERY_STRING"]);
foreach ($tmp as $h) {
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index 1bf85b7..d859829 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -43,7 +43,7 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').
'uri='.urlencode($item->getURI()));
$this->_xml->setCiscoElement('MenuItem',
<span style="color: #A00000">- Array('Name' => $item->getDisplayName(), 'URL' => $url));</span>
<span style="color: #00A000">+ Array('Name' => $item->getDisplayName(64), 'URL' => $url));</span>
}
public function finish($item) {
$pos = 1;
<span style="color: #800080; font-weight: bold">@@ -52,7 +52,7 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
'URL' => 'SoftKey:Select',
'Position' => $pos++));
foreach (MediaBrotha_Core::getBackends() as $backend) {
<span style="color: #A00000">- foreach ($backend->getMediaActions($item) as $action) {</span>
<span style="color: #00A000">+ foreach ($backend->getVisibleMediaActions($item) as $action) {</span>
$this->_xml->setCiscoElement('SoftKeyItem',
Array('Name' => $action,
'URL' => 'QueryStringParam:'.MediaBrotha_Core::value2hash('action='.$action.'&backend='.$backend->getBackendName()),
<span style="color: #800080; font-weight: bold">@@ -77,12 +77,13 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
//$xml->setCiscoElement('Prompt', ...);
$xml->setCiscoElement('URL', $this->rootURL());
foreach($form as $field) {
<span style="color: #00A000">+ $flags = 'A';</span>
$xml->setCiscoElement('InputItem',
Array(
'DisplayName' => $field->get('display_name'),
'QueryStringParam' => $field->get('name'),
'DefaultValue' => $field->get('value'),
<span style="color: #A00000">- 'InputFlags' => '',</span>
<span style="color: #00A000">+ 'InputFlags' => $flags,</span>
)
);
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #000080; font-weight: bold">index f6d4015..c1ea4df 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #800080; font-weight: bold">@@ -40,7 +40,7 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
'uri='.urlencode($media->getURI()));
foreach (MediaBrotha_Core::getBackends() as $backend) {
<span style="color: #A00000">- foreach ($backend->getMediaActions($media) as $action) {</span>
<span style="color: #00A000">+ foreach ($backend->getVisibleMediaActions($media) as $action) {</span>
$tag = $this->_xml->createElement($tag_name);
$tag = $parent->appendChild($tag);
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Minor cleanup, removed options that were not needed, and stop debug logging.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index b97d932..959dc0d 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -652,7 +652,7 @@ namespace FSClient {</span>
XmlUtils.AddNodeAttrib(config_node, "name", name);
XmlUtils.AddNodeAttrib(config_node, "description", desc);
func(config_node);
<span style="color: #A00000">- root_doc.Save(@"c:\temp\fs_" + name);</span>
<span style="color: #00A000">+ //root_doc.Save(@"c:\temp\fs_" + name);</span>
return root_doc.OuterXml;
}
private string xml_search(FreeSWITCH.SwitchXmlSearchBinding.XmlBindingArgs args) {
<span style="color: #800080; font-weight: bold">@@ -674,9 +674,9 @@ namespace FSClient {</span>
private static IDisposable event_bind;
private void fs_core_init() {
<span style="color: #A00000">- fs_inited = true;</span>
<span style="color: #A00000">- freeswitch.switch_core_set_globals();</span>
<span style="color: #00A000">+ fs_inited = true;</span>
String err = "";
<span style="color: #00A000">+ freeswitch.switch_core_set_globals();</span>
const uint flags = (uint)(switch_core_flag_enum_t.SCF_USE_SQL | switch_core_flag_enum_t.SCF_USE_AUTO_NAT);
switch_status_t res = freeswitch.switch_core_init(flags, switch_bool_t.SWITCH_FALSE, ref err);
search_bind = FreeSWITCH.SwitchXmlSearchBinding.Bind(xml_search, switch_xml_section_enum_t.SWITCH_XML_SECTION_CONFIG);
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/External Items/conf/freeswitch.xml b/mitchcapper/FSClient/External Items/conf/freeswitch.xml</span>
<span style="color: #000080; font-weight: bold">index abd04ad..8c53be0 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/External Items/conf/freeswitch.xml </span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/External Items/conf/freeswitch.xml </span>
<span style="color: #800080; font-weight: bold">@@ -1,14 +1,8 @@</span>
<?xml version="1.0"?>
<document type="freeswitch/xml">
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="auto_answer=false"/></span>
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/></span>
<X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/></span>
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/></span>
<X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
<X-PRE-PROCESS cmd="set" data="us-ring=v=0;%(2000,4000,440.0,480.0)"/>
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/></span>
<span style="color: #A00000">- <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/></span>
<section name="configuration" description="Various Configuration">
<configuration name="console.conf" description="Console Logger">
<span style="color: #800080; font-weight: bold">@@ -36,15 +30,12 @@</span>
</settings>
<profiles>
<profile name="default">
<span style="color: #A00000">- <settings></span>
<span style="color: #A00000">- </settings></span>
<mappings>
<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
</mappings>
</profile>
</profiles>
</configuration>
<span style="color: #A00000">-</span>
<configuration name="modules.conf" description="Modules">
<modules>
<load module="mod_console"/>
<span style="color: #800080; font-weight: bold">@@ -69,38 +60,20 @@</span>
<load module="mod_event_socket"/>
</modules>
</configuration>
<span style="color: #A00000">-</span>
<configuration name="portaudio.conf" description="Soundcard Endpoint">
<settings>
<span style="color: #A00000">- <param name="indev" value="4"/></span>
<span style="color: #A00000">- <param name="outdev" value="8"/></span>
<span style="color: #A00000">- <param name="ringdev" value="8"/></span>
<param name="dual-streams" value="true" />
<param name="live-stream-switch" value="true" />
<param name="no-auto-resume-call" value="true" />
<span style="color: #A00000">- <param name="no-ring-during-call" value="true" /></span>
<span style="color: #A00000">- </span>
<span style="color: #A00000">- </span>
<span style="color: #00A000">+ <param name="no-ring-during-call" value="true" /> </span>
<param name="ring-file" value="tone_stream://%(2000,4000,440.0,480.0);loops=20"/>
<param name="ring-interval" value="5"/>
<param name="hold-file" value="$${hold_music}"/>
<param name="dialplan" value="XML"/>
<param name="sample-rate" value="24000"/>
<param name="codec-ms" value="20"/>
<span style="color: #A00000">- <!--</span>
<span style="color: #A00000">- Alternate items:</span>
<span style="color: #A00000">- codec-ms</span>
<span style="color: #A00000">- sample-rate=8000</span>
<span style="color: #A00000">- </span>
<span style="color: #A00000">- --></span>
</settings>
</configuration>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- <configuration name="post_load_modules.conf" description="Modules"></span>
<span style="color: #A00000">- <modules></span>
<span style="color: #A00000">- </modules></span>
<span style="color: #A00000">- </configuration></span>
<span style="color: #A00000">-</span>
<configuration name="switch.conf" description="Core Configuration">
<cli-keybindings>
<key name="1" value="help"/>
<span style="color: #800080; font-weight: bold">@@ -117,12 +90,10 @@</span>
<key name="12" value="version"/>
</cli-keybindings>
<settings>
<span style="color: #A00000">- <param name="colorize-console" value="true"/></span>
<span style="color: #A00000">- <param name="max-sessions" value="20"/></span>
<span style="color: #A00000">- <param name="sessions-per-second" value="5"/></span>
<span style="color: #00A000">+ <param name="colorize" value="true"/></span>
<span style="color: #00A000">+ <param name="max-sessions" value="100"/></span>
<span style="color: #00A000">+ <param name="sessions-per-second" value="30"/></span>
<param name="loglevel" value="debug"/>
<span style="color: #A00000">- <param name="crash-protection" value="false"/></span>
<span style="color: #A00000">- <param name="dump-cores" value="yes"/></span>
<param name="rtp-start-port" value="16384"/>
<param name="rtp-end-port" value="16484"/>
</settings>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #000080; font-weight: bold">index 3f776d6..b3f3b3d 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #800080; font-weight: bold">@@ -75,7 +75,6 @@ namespace FSClient {</span>
XmlNode global_settings = XmlUtils.AddNodeNode(config_node, "global_settings");
Utils.add_xml_param(global_settings, "auto-restart", "true");
<span style="color: #A00000">- Utils.add_xml_param(global_settings, "debug-presence", "0");</span>
Utils.add_xml_param(global_settings, "log-level", "0");
XmlNode profiles = XmlUtils.AddNodeNode(config_node, "profiles");
XmlNode profile = XmlUtils.AddNodeNode(profiles, "profile");
<span style="color: #800080; font-weight: bold">@@ -87,7 +86,6 @@ namespace FSClient {</span>
Utils.add_xml_param(settings, "context", "public");
Utils.add_xml_param(settings, "dialplan", "xml");
Utils.add_xml_param(settings, "disable-register", "true");
<span style="color: #A00000">- Utils.add_xml_param(settings, "manage-presence", "false");</span>
foreach (FieldValue value in values) {
if (!String.IsNullOrEmpty(value.field.xml_name))
Utils.add_xml_param(settings, value.field.xml_name, value.value);
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: LDAP search form
And more:
<span style="color: #A00000">- callback</span>
<span style="color: #A00000">- rework of actions</span>
<span style="color: #A00000">- exceptions handling</span>
<span style="color: #A00000">- forms</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/index.php b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #000080; font-weight: bold">index 137b409..c3286fa 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,7 +25,7 @@ This file is part of XML services for Cisco IP Phones.</span>
*/
//* Debug
<span style="color: #A00000">-ini_set('error_reporting', E_ALL | E_STRUCT);</span>
<span style="color: #00A000">+ini_set('error_reporting', E_ALL);</span>
ini_set('display_errors', 1);
// */
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #000080; font-weight: bold">index 216aad6..0da1cc3 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,7 +25,9 @@ This file is part of XML services for Cisco IP Phones.</span>
*/
class CiscoIPPhone {
static public function userAgentIsCiscoIPPhone() {
<span style="color: #A00000">- return preg_match('/^Allegro-Software-WebClient\//', $_SERVER['HTTP_USER_AGENT']);</span>
<span style="color: #00A000">+ if (isset($_SERVER['HTTP_USER_AGENT'])) {</span>
<span style="color: #00A000">+ return preg_match('/^Allegro-Software-WebClient\//', $_SERVER['HTTP_USER_AGENT']);</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #000080; font-weight: bold">index 28a8441..8e56562 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -26,8 +26,8 @@ This file is part of MediaBrotha.</span>
require_once('MediaBrotha/Media.php');
<span style="color: #A00000">-class MediaBrotha_Backend {</span>
<span style="color: #A00000">- protected $_params = NULL;</span>
<span style="color: #00A000">+abstract class MediaBrotha_Backend {</span>
<span style="color: #00A000">+ private $_params = NULL;</span>
public function __construct($params = NULL) {
$this->setParam($params);
<span style="color: #800080; font-weight: bold">@@ -35,7 +35,7 @@ class MediaBrotha_Backend {</span>
}
/* params */
<span style="color: #A00000">- public function getParam($name = NULL) {</span>
<span style="color: #00A000">+ final public function getParam($name = NULL) {</span>
if ($name === NULL) {
return $this->_params;
} elseif (isset($this->_params[$name])) {
<span style="color: #800080; font-weight: bold">@@ -44,7 +44,7 @@ class MediaBrotha_Backend {</span>
return NULL;
}
}
<span style="color: #A00000">- public function setParam($name, $value = NULL) {</span>
<span style="color: #00A000">+ final public function setParam($name, $value = NULL) {</span>
if (is_array($name)) {
$this->_params = $name;
} else {
<span style="color: #800080; font-weight: bold">@@ -66,10 +66,6 @@ class MediaBrotha_Backend {</span>
return $item;
}
<span style="color: #A00000">- public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
// Actions
public function getMediaActions(MediaBrotha_Media $media) {
return Array();
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #000080; font-weight: bold">index 006814b..c23a86f 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #800080; font-weight: bold">@@ -61,19 +61,6 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
}
}
<span style="color: #A00000">- public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- $uri = $media->getURI();</span>
<span style="color: #A00000">- if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {</span>
<span style="color: #A00000">- $uri = 'file://'.$this->getParam('base_path');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- $path = parse_url($uri, PHP_URL_PATH);</span>
<span style="color: #A00000">- if (is_dir($path)) {</span>
<span style="color: #A00000">- return new MediaBrotha_MediaIterator($this, $media, new DirectoryIterator($path));</span>
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
// Actions
protected function _isHandled(MediaBrotha_Media $media) {
return ($media->getMimeType() === 'application/x-directory')
<span style="color: #800080; font-weight: bold">@@ -83,6 +70,7 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
public function getMediaActions(MediaBrotha_Media $media) {
if ($this->_isHandled($media)) {
return Array(
<span style="color: #00A000">+ '_default',</span>
'browse',
);
} else {
<span style="color: #800080; font-weight: bold">@@ -90,6 +78,25 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
}
}
<span style="color: #00A000">+ public function doMediaAction($action, MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ switch($action) {</span>
<span style="color: #00A000">+ case '_default':</span>
<span style="color: #00A000">+ case 'browse':</span>
<span style="color: #00A000">+ $uri = $media->getURI();</span>
<span style="color: #00A000">+ if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ $uri = 'file://'.$this->getParam('base_path');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $path = parse_url($uri, PHP_URL_PATH);</span>
<span style="color: #00A000">+ if (is_dir($path)) {</span>
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, new DirectoryIterator($path));</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ return parent::doMediaAction($action, $media);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
// Populate
public function populateMedia(MediaBrotha_Media $media) {
if ($this->_isHandled($media)) {
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #000080; font-weight: bold">index 365e78e..2b04351 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #800080; font-weight: bold">@@ -63,21 +63,6 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
}
}
<span style="color: #A00000">- public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- $uri = $media->getURI();</span>
<span style="color: #A00000">- if (($this::parseLDAPURI($uri, PHP_URL_SCHEME) != 'ldap') || !$this->isURISafe($uri)) {</span>
<span style="color: #A00000">- $ldap_connect_config = $this->getParam('ldap_connect_config');</span>
<span style="color: #A00000">- $uri = 'ldap:///'.$ldap_connect_config['basedn'];</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- $basedn = $this::parseLDAPURI($uri, PHP_URL_PATH);</span>
<span style="color: #A00000">- if ($basedn && ($basedn{0} = '/')) {</span>
<span style="color: #A00000">- $basedn = substr($basedn, 1);</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- $ldap_search = $this->_ldap->search($basedn, NULL,</span>
<span style="color: #A00000">- Array());</span>
<span style="color: #A00000">- return new MediaBrotha_MediaIterator($this, $media, $ldap_search);</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #A00000">- }</span>
// Actions
protected function _isHandled(MediaBrotha_Media $media) {
return ($media->getMimeType() === 'text/directory')
<span style="color: #800080; font-weight: bold">@@ -87,12 +72,74 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
public function getMediaActions(MediaBrotha_Media $media) {
if ($this->_isHandled($media)) {
return Array(
<span style="color: #00A000">+ '_default',</span>
'browse',
<span style="color: #00A000">+ 'search',</span>
);
} else {
return parent::getMediaActions($media);
}
}
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ public function doMediaAction($action, MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ switch($action) {</span>
<span style="color: #00A000">+ case 'browse':</span>
<span style="color: #00A000">+ $uri = $media->getURI();</span>
<span style="color: #00A000">+ if (($this::parseLDAPURI($uri, PHP_URL_SCHEME) != 'ldap') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ $ldap_connect_config = $this->getParam('ldap_connect_config');</span>
<span style="color: #00A000">+ $uri = 'ldap:///'.$ldap_connect_config['basedn'];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $basedn = $this::parseLDAPURI($uri, PHP_URL_PATH);</span>
<span style="color: #00A000">+ if ($basedn && ($basedn{0} = '/')) {</span>
<span style="color: #00A000">+ $basedn = substr($basedn, 1);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $ldap_search = $this->_ldap->search($basedn, NULL,</span>
<span style="color: #00A000">+ Array());</span>
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, $ldap_search);</span>
<span style="color: #00A000">+ case '_default':</span>
<span style="color: #00A000">+ case 'search':</span>
<span style="color: #00A000">+ $form = new MediaBrotha_Form();</span>
<span style="color: #00A000">+ $form->setTitle('search');</span>
<span style="color: #00A000">+ $search_fields = Array(</span>
<span style="color: #00A000">+ 'sn' => Array('display_name' => 'last name'),</span>
<span style="color: #00A000">+ 'givenName' => Array('display_name' => 'first name'),</span>
<span style="color: #00A000">+ 'telephoneNumber' => Array('display_name' => 'phone', 'filter' => '(telephoneNumber=*%s*)'),</span>
<span style="color: #00A000">+ //'o' => Array('display_name' => 'organization'),</span>
<span style="color: #00A000">+ //'mobile' => Array('display_name' => 'mobile'),</span>
<span style="color: #00A000">+ //'facsimileTelephoneNumber' => Array('display_name' => 'fax'),</span>
<span style="color: #00A000">+ //'l' => Array('display_name' => 'location'),</span>
<span style="color: #00A000">+ //'st' => Array('display_name' => 'department'),</span>
<span style="color: #00A000">+ //'roomNumber' => Array('display_name' => 'room number'),</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ $ldap_connect_config = $this->getParam('ldap_connect_config');</span>
<span style="color: #00A000">+ $filter = $ldap_connect_config['filter'];</span>
<span style="color: #00A000">+ foreach ($search_fields as $attribute_name => $field) {</span>
<span style="color: #00A000">+ $field['name'] = $attribute_name;</span>
<span style="color: #00A000">+ if (!empty($_GET[$attribute_name])) {</span>
<span style="color: #00A000">+ $field['value'] = $_GET[$attribute_name];</span>
<span style="color: #00A000">+ if(empty($infos['filter'])) {</span>
<span style="color: #00A000">+ $filter="(&$filter($attribute_name=".$_GET[$attribute_name]."*))";</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $filter="(&$filter".sprintf($infos['filter'], $_GET[$attribute_name]).")";</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $form->addField($field);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if (empty($_GET['ldap_search'])) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::addCallback('MediaBrotha_Backend_LDAP::searchCallback');</span>
<span style="color: #00A000">+ return $form;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $ldap_search = $this->_ldap->search(NULL, $filter,</span>
<span style="color: #00A000">+ Array('scope' => 'sub'));</span>
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, $ldap_search);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ return parent::doMediaAction($action, $media);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ static public function searchCallback() {</span>
<span style="color: #00A000">+ $_GET['backend'] = 'LDAP';</span>
<span style="color: #00A000">+ $_GET['action'] = 'search';</span>
<span style="color: #00A000">+ $_GET['ldap_search'] = '1';</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #000080; font-weight: bold">index 9616be8..613ce17 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #800080; font-weight: bold">@@ -35,7 +35,7 @@ class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
'display_name' => 'Root',
)
);
<span style="color: #A00000">- $this->_media_iterator = new MediaBrotha_MediaIterator($this, $this->_media);</span>
<span style="color: #00A000">+ $this->_media_iterator = new MediaBrotha_MediaIterator($this);</span>
}
public function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {
<span style="color: #800080; font-weight: bold">@@ -45,9 +45,15 @@ class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
$this->_media_iterator->bufferAdd($media);
}
<span style="color: #A00000">- // Browsing</span>
<span style="color: #A00000">- public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return $this->_media_iterator;</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function doMediaAction($action, MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ switch($action) {</span>
<span style="color: #00A000">+ case '_default':</span>
<span style="color: #00A000">+ case 'browse':</span>
<span style="color: #00A000">+ return $this->_media_iterator;</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ return parent::doMediaAction($action, $media);</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index 8c3208e..d881850 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -43,12 +43,6 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
print $output.'<!--'.$url."-->\n";
}
<span style="color: #A00000">- // Browsing</span>
<span style="color: #A00000">- public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- $this->_buffer[] = $media;</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
// Actions
protected function _isHandled(MediaBrotha_Media $media) {
return in_array($media->getMimeType(), Array($this::$_supported_mime_types))
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index 8997a7c..f241c66 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,6 +28,7 @@ require_once('MediaBrotha/Backend.php');</span>
require_once('MediaBrotha/Frontend.php');
require_once('MediaBrotha/Media.php');
require_once('MediaBrotha/MediaIterator.php');
<span style="color: #00A000">+require_once('MediaBrotha/Form.php');</span>
class MediaBrotha_Core {
private static $_frontend = NULL;
<span style="color: #800080; font-weight: bold">@@ -38,20 +39,26 @@ class MediaBrotha_Core {</span>
* Core
*/
public static function init() {
<span style="color: #A00000">- if (!session_start()) {</span>
<span style="color: #A00000">- die('Unable to start session');</span>
<span style="color: #00A000">+ try {</span>
<span style="color: #00A000">+ if (!session_start()) {</span>
<span style="color: #00A000">+ throw new Exception('Unable to start session');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ MediaBrotha_Core::_unhashRequest();</span>
<span style="color: #00A000">+ MediaBrotha_Core::loadBackend('Root');</span>
<span style="color: #00A000">+ } catch (Exception $e) {</span>
<span style="color: #00A000">+ die($e);</span>
}
<span style="color: #A00000">- MediaBrotha_Core::_unhashRequest();</span>
<span style="color: #A00000">- MediaBrotha_Core::loadBackend('Root');</span>
}
public static function go() {
<span style="color: #A00000">- $current_backend = MediaBrotha_Core::getCurrentBackend();</span>
<span style="color: #A00000">- $current_media = MediaBrotha_Core::getCurrentMedia();</span>
<span style="color: #A00000">- if (MediaBrotha_Core::getAction() == 'browse') {</span>
<span style="color: #A00000">- if ($media_iterator = $current_backend->fetch($current_media)) {</span>
<span style="color: #00A000">+ try {</span>
<span style="color: #00A000">+ MediaBrotha_Core::runCallback();</span>
<span style="color: #00A000">+ $current_backend = MediaBrotha_Core::getCurrentBackend();</span>
<span style="color: #00A000">+ $current_media = MediaBrotha_Core::getCurrentMedia();</span>
<span style="color: #00A000">+ $result = $current_backend->doMediaAction(MediaBrotha_Core::getAction(), $current_media);</span>
<span style="color: #00A000">+ if (is_a($result, 'MediaBrotha_MediaIterator')) {</span>
MediaBrotha_Core::$_frontend->begin($current_media);
<span style="color: #A00000">- foreach ($media_iterator as $item) {</span>
<span style="color: #00A000">+ foreach ($result as $item) {</span>
if (($item === NULL) || $item->isHidden()) {
continue;
}
<span style="color: #800080; font-weight: bold">@@ -59,17 +66,32 @@ class MediaBrotha_Core {</span>
}
MediaBrotha_Core::$_frontend->finish($current_media);
MediaBrotha_Core::$_frontend->render($current_media);
<span style="color: #00A000">+ } elseif (is_a($result, 'MediaBrotha_Form')) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->renderForm($result);</span>
<span style="color: #00A000">+ } elseif (is_a($result, 'Exception')) {</span>
<span style="color: #00A000">+ throw $result;</span>
} else {
<span style="color: #00A000">+ throw new Exception("Got unexpected result '$result'.");</span>
}
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- $current_backend->doMediaAction(MediaBrotha_Core::getAction(), $current_media);</span>
<span style="color: #00A000">+ } catch (Exception $e) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->renderException($e);</span>
}
}
<span style="color: #A00000">- public function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ public static function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {</span>
MediaBrotha_Core::$_backends['Root']->addRootMedia($URI, $metadata, $mime_type, $mime_encoding);
}
<span style="color: #00A000">+ public static function addCallback($callback, $arg = NULL) {</span>
<span style="color: #00A000">+ $_SESSION['CALLBACK'][] = Array($callback, $arg);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function runCallback() {</span>
<span style="color: #00A000">+ while($callback_info = array_shift($_SESSION['CALLBACK'])) {</span>
<span style="color: #00A000">+ call_user_func($callback_info[0],$callback_info[1]);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
/*
* Backends
*/
<span style="color: #800080; font-weight: bold">@@ -129,7 +151,7 @@ class MediaBrotha_Core {</span>
if (!empty($_GET['action'])) {
return $_GET['action'];
} else {
<span style="color: #A00000">- return 'browse';</span>
<span style="color: #00A000">+ return '_default';</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Form.php</span>
similarity index 60%
copy from sathieu/cisco-xml/lib/MediaBrotha/Frontend.php
copy to sathieu/cisco-xml/lib/MediaBrotha/Form.php
<span style="color: #000080; font-weight: bold">index 2cc6060..08dd4c6 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Form.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,11 +24,31 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Frontend {</span>
<span style="color: #A00000">- protected $_infos = NULL;</span>
<span style="color: #00A000">+class MediaBrotha_Field {</span>
<span style="color: #00A000">+ private $_attrs;</span>
<span style="color: #A00000">- public function __construct(array $args = Array()) {</span>
<span style="color: #A00000">- $this->_infos = $args;</span>
<span style="color: #00A000">+ public function __construct(array $attrs) {</span>
<span style="color: #00A000">+ $this->_attrs = $attrs;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function get($name) {</span>
<span style="color: #00A000">+ if (isset($this->_attrs[$name])) {</span>
<span style="color: #00A000">+ return $this->_attrs[$name];</span>
<span style="color: #00A000">+ } </span>
}
}
<span style="color: #00A000">+class MediaBrotha_Form extends ArrayIterator {</span>
<span style="color: #00A000">+ private $_title;</span>
<span style="color: #00A000">+ public function getTitle() {</span>
<span style="color: #00A000">+ return $this->_title;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function setTitle($title) {</span>
<span style="color: #00A000">+ $this->_title = $title;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function addField(array $args) {</span>
<span style="color: #00A000">+ $this[] = new MediaBrotha_Field($args);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #000080; font-weight: bold">index 2cc6060..be427fa 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,11 +24,19 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Frontend {</span>
<span style="color: #00A000">+abstract class MediaBrotha_Frontend {</span>
protected $_infos = NULL;
public function __construct(array $args = Array()) {
$this->_infos = $args;
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function renderException(Exception $e) {</span>
<span style="color: #00A000">+ print $e;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function renderForm(MediaBrotha_Form $form) {</span>
<span style="color: #00A000">+ throw new Exception(__FUNCTION__ .' not implemented in class "'.get_class($this).'"');</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index 914e6ee..1bf85b7 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -52,7 +52,7 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
'URL' => 'SoftKey:Select',
'Position' => $pos++));
foreach (MediaBrotha_Core::getBackends() as $backend) {
<span style="color: #A00000">- foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentMedia()) as $action) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions($item) as $action) {</span>
$this->_xml->setCiscoElement('SoftKeyItem',
Array('Name' => $action,
'URL' => 'QueryStringParam:'.MediaBrotha_Core::value2hash('action='.$action.'&backend='.$backend->getBackendName()),
<span style="color: #800080; font-weight: bold">@@ -70,5 +70,25 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
print $this->_xml->execute($this->_infos['push_url']);
}
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function renderForm(MediaBrotha_Form $form) {</span>
<span style="color: #00A000">+ $xml = new CiscoIPPhoneInput();</span>
<span style="color: #00A000">+ $xml->setCiscoElement('Title', $form->getTitle());</span>
<span style="color: #00A000">+ //$xml->setCiscoElement('Prompt', ...);</span>
<span style="color: #00A000">+ $xml->setCiscoElement('URL', $this->rootURL());</span>
<span style="color: #00A000">+ foreach($form as $field) {</span>
<span style="color: #00A000">+ $xml->setCiscoElement('InputItem',</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'DisplayName' => $field->get('display_name'),</span>
<span style="color: #00A000">+ 'QueryStringParam' => $field->get('name'),</span>
<span style="color: #00A000">+ 'DefaultValue' => $field->get('value'),</span>
<span style="color: #00A000">+ 'InputFlags' => '',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ CiscoXMLObject::HttpHeader();</span>
<span style="color: #00A000">+ print $xml;</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #000080; font-weight: bold">index 6d09e1b..f6d4015 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #800080; font-weight: bold">@@ -54,7 +54,7 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
}
}
<span style="color: #A00000">- public function begin($item) {</span>
<span style="color: #00A000">+ private function _createHTMLDocument($title) {</span>
$this->_xml = new DOMDocument('1.0');
$root = $this->_xml->createElement('html');
$root = $this->_xml->appendChild($root);
<span style="color: #800080; font-weight: bold">@@ -62,11 +62,10 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
$head = $this->_xml->createElement('head');
$head = $root->appendChild($head);
<span style="color: #A00000">- $title = $this->_xml->createElement('title');</span>
<span style="color: #A00000">- $title = $head->appendChild($title);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- $text = $this->_xml->createTextNode($item->getDisplayName());</span>
<span style="color: #A00000">- $text = $title->appendChild($text);</span>
<span style="color: #00A000">+ $titleElement = $this->_xml->createElement('title');</span>
<span style="color: #00A000">+ $titleElement = $head->appendChild($titleElement);</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($title);</span>
<span style="color: #00A000">+ $text = $titleElement->appendChild($text);</span>
$style = $this->_xml->createElement('link');
$style = $head->appendChild($style);
<span style="color: #800080; font-weight: bold">@@ -82,7 +81,10 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
$this->_body = $this->_xml->createElement('body');
$this->_body = $root->appendChild($this->_body);
$this->_body->setAttribute('onload', 'bodyLoaded();');
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function begin($item) {</span>
<span style="color: #00A000">+ $this->_createHTMLDocument($item->getDisplayName());</span>
$this->_mediaListElement = $this->_xml->createElement('ul');
$this->_mediaListElement = $this->_body->appendChild($this->_mediaListElement);
$this->_mediaListElement->setAttribute('id', 'mediaListElement');
<span style="color: #800080; font-weight: bold">@@ -123,5 +125,60 @@ class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
public function render() {
print $this->_xml->saveHTML();
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function renderForm(MediaBrotha_Form $form) {</span>
<span style="color: #00A000">+ $this->_createHTMLDocument($form->getTitle());</span>
<span style="color: #00A000">+ $formElement = $this->_xml->createElement('form');</span>
<span style="color: #00A000">+ $formElement = $this->_body->appendChild($formElement);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tableElement = $this->_xml->createElement('table');</span>
<span style="color: #00A000">+ $tableElement = $formElement->appendChild($tableElement);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ foreach($form as $field) {</span>
<span style="color: #00A000">+ $trElement = $this->_xml->createElement('tr');</span>
<span style="color: #00A000">+ $trElement = $tableElement->appendChild($trElement);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tdElement1 = $this->_xml->createElement('th');</span>
<span style="color: #00A000">+ $tdElement1 = $trElement->appendChild($tdElement1);</span>
<span style="color: #00A000">+ $text1 = $this->_xml->createTextNode($field->get('display_name'));</span>
<span style="color: #00A000">+ $text1 = $tdElement1->appendChild($text1);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tdElement2 = $this->_xml->createElement('td');</span>
<span style="color: #00A000">+ $tdElement2 = $trElement->appendChild($tdElement2);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $inputElement = $this->_xml->createElement('input');</span>
<span style="color: #00A000">+ $inputElement = $tdElement2->appendChild($inputElement);</span>
<span style="color: #00A000">+ $inputElement->setAttribute('name', $field->get('name'));</span>
<span style="color: #00A000">+ $inputElement->setAttribute('value', $field->get('value'));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $trElement = $this->_xml->createElement('tr');</span>
<span style="color: #00A000">+ $trElement = $tableElement->appendChild($trElement);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $tdElement = $this->_xml->createElement('td');</span>
<span style="color: #00A000">+ $tdElement = $trElement->appendChild($tdElement);</span>
<span style="color: #00A000">+ $tdElement->setAttribute('colspan', 2);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $inputElement = $this->_xml->createElement('input');</span>
<span style="color: #00A000">+ $inputElement = $tdElement->appendChild($inputElement);</span>
<span style="color: #00A000">+ $inputElement->setAttribute('type', 'submit');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ print $this->_xml->saveHTML();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function renderException(Exception $e) {</span>
<span style="color: #00A000">+ $this->_createHTMLDocument('Error');</span>
<span style="color: #00A000">+ $divElement = $this->_xml->createElement('pre');</span>
<span style="color: #00A000">+ $divElement = $this->_body->appendChild($divElement);</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($e->getMessage());</span>
<span style="color: #00A000">+ $text = $divElement->appendChild($text);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $divElement = $this->_xml->createElement('pre');</span>
<span style="color: #00A000">+ $divElement = $this->_body->appendChild($divElement);</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($e->getTraceAsString());</span>
<span style="color: #00A000">+ $text = $divElement->appendChild($text);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ print $this->_xml->saveHTML();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php</span>
<span style="color: #000080; font-weight: bold">index de19bf7..f225175 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,10 +24,14 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Frontend_HTTP extends MediaBrotha_Frontend {</span>
<span style="color: #00A000">+abstract class MediaBrotha_Frontend_HTTP extends MediaBrotha_Frontend {</span>
public function rootURL() {
<span style="color: #A00000">- $url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];</span>
<span style="color: #A00000">- $url = preg_replace('/index\.php$/', '', $url);</span>
<span style="color: #00A000">+ if (isset($_SERVER['SERVER_NAME'])) {</span>
<span style="color: #00A000">+ $url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];</span>
<span style="color: #00A000">+ $url = preg_replace('/index\.php$/', '', $url);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $url = $_SERVER['SCRIPT_NAME'];</span>
<span style="color: #00A000">+ }</span>
return $url;
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Media.php b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #000080; font-weight: bold">index 7964473..d32ee48 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,7 +24,7 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Media {</span>
<span style="color: #00A000">+final class MediaBrotha_Media {</span>
private $_URI = NULL;
private $_metadata = Array();
private $_mimeType = NULL;
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php b/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php</span>
<span style="color: #000080; font-weight: bold">index 096759a..e862661 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,13 +28,11 @@ require_once('MediaBrotha/Media.php');</span>
class MediaBrotha_MediaIterator implements Iterator {
private $_backend = NULL;
<span style="color: #A00000">- private $_media = NULL;</span>
private $_handle = NULL;
protected $_buffer = NULL;
<span style="color: #A00000">- public function __construct(MediaBrotha_Backend $backend, MediaBrotha_Media $media, $buffer = NULL) {</span>
<span style="color: #00A000">+ public function __construct(MediaBrotha_Backend $backend, $buffer = NULL) {</span>
$this->_backend = $backend;
<span style="color: #A00000">- $this->_media = $media;</span>
if ($buffer) {
$this->_buffer = $buffer;
} else {
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Make search box text a bit smaller so it fits
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/MainWindow.xaml b/mitchcapper/FSClient/MainWindow.xaml</span>
<span style="color: #000080; font-weight: bold">index 5e1eb04..3464dc9 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/MainWindow.xaml</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/MainWindow.xaml</span>
<span style="color: #800080; font-weight: bold">@@ -176,7 +176,7 @@</span>
</Canvas>
<Button Canvas.Left="283" Canvas.Top="21" Content="Send To Voicemail" FontWeight="Bold" Foreground="#FFF5E200" Height="20" Name="btnSendVoicemail" Style="{DynamicResource GlassButtonStyle}" Width="120" Visibility="Hidden" Click="btnSendVoicemail_Click" />
<span style="color: #A00000">- <ours:OurAutoCompleteBox Canvas.Left="435" Text="Contact Search" Canvas.Top="265" Height="22" Width="164.553" Opacity="0.8" x:Name="txtSearchBox" FilterMode="Contains" GotKeyboardFocus="txtSearchBox_GotKeyboardFocus" LostKeyboardFocus="txtSearchBox_LostKeyboardFocus" DropDownClosing="txtSearchBox_DropDownClosing"></span>
<span style="color: #00A000">+ <ours:OurAutoCompleteBox Canvas.Left="435" Text="Contact Search" Canvas.Top="265" Height="22" Width="164.553" Opacity="0.8" x:Name="txtSearchBox" FilterMode="Contains" GotKeyboardFocus="txtSearchBox_GotKeyboardFocus" LostKeyboardFocus="txtSearchBox_LostKeyboardFocus" DropDownClosing="txtSearchBox_DropDownClosing" FontSize="11"></span>
<ours:OurAutoCompleteBox.ItemTemplate>
<DataTemplate>
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: Add missing HTML files
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/static/default.css b/sathieu/cisco-xml/browser/static/default.css</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..6ef61fc</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/static/default.css</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,49 @@</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+ * body > ul#mediaListElement > li.mediaElement</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+li.mediaElement {</span>
<span style="color: #00A000">+ padding: 2px;</span>
<span style="color: #00A000">+ margin: 0px;</span>
<span style="color: #00A000">+ list-style-type: none;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+li.mediaElement:nth-child(odd) {</span>
<span style="color: #00A000">+ background-color: #d1e3ed;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+ * body > ul#mediaListElement</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+#mediaListElement {</span>
<span style="color: #00A000">+ padding: 2px;</span>
<span style="color: #00A000">+ margin: 0px;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+ * body > ul#mediaListElement > li.mediaElement > ul.mediaActionsListElement</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+li.mediaElement .mediaActionsListElement {</span>
<span style="color: #00A000">+ padding: 2px;</span>
<span style="color: #00A000">+ margin: 0px;</span>
<span style="color: #00A000">+ margin-left: 20px;</span>
<span style="color: #00A000">+ list-style-type: none;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ -moz-transition-property: max-height, opacity, visibility;</span>
<span style="color: #00A000">+ -moz-transition-duration: 3s, 2s, 0.2s;</span>
<span style="color: #00A000">+ -moz-transition-delay: 0s, 1s, 1s;</span>
<span style="color: #00A000">+ max-height: 0px;</span>
<span style="color: #00A000">+ opacity: 0;</span>
<span style="color: #00A000">+ visibility: hidden;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+li.mediaElement:hover .mediaActionsListElement {</span>
<span style="color: #00A000">+ -moz-transition-property: max-height, opacity, visibility;</span>
<span style="color: #00A000">+ -moz-transition-duration: 0.5s, 2s, 0.2s;</span>
<span style="color: #00A000">+ -moz-transition-delay: 0.4s, 0.4s, 0.4s;</span>
<span style="color: #00A000">+ max-height: 200px;</span>
<span style="color: #00A000">+ opacity: 1;</span>
<span style="color: #00A000">+ visibility: visible;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/static/dynamic.js b/sathieu/cisco-xml/browser/static/dynamic.js</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..721eb51</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/static/dynamic.js</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,4 @@</span>
<span style="color: #00A000">+function bodyLoaded() {</span>
<span style="color: #00A000">+ //nothing yet</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..6d09e1b</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,127 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+require_once('HTTP.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Frontend_HTML extends MediaBrotha_Frontend_HTTP {</span>
<span style="color: #00A000">+ private $_xml = NULL;</span>
<span style="color: #00A000">+ private $_body = NULL;</span>
<span style="color: #00A000">+ private $_mediaListElement = NULL;</span>
<span style="color: #00A000">+ private $_actionsListElement = NULL;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ private function _mediaActionLinks($parent, $media, $tag_name) {</span>
<span style="color: #00A000">+ $url = $this->rootURL().'?'.</span>
<span style="color: #00A000">+ MediaBrotha_Core::value2hash(</span>
<span style="color: #00A000">+ 'mime_type='.urlencode($media->getMimeType()).'&'.</span>
<span style="color: #00A000">+ ($media->getMimeEncoding() ? ('mime_encoding='.urlencode($media->getMimeEncoding()).'&') : '').</span>
<span style="color: #00A000">+ 'uri='.urlencode($media->getURI()));</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions($media) as $action) {</span>
<span style="color: #00A000">+ $tag = $this->_xml->createElement($tag_name);</span>
<span style="color: #00A000">+ $tag = $parent->appendChild($tag);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $a = $this->_xml->createElement('a');</span>
<span style="color: #00A000">+ $a = $tag->appendChild($a);</span>
<span style="color: #00A000">+ $a->setAttribute('href', "$url&".MediaBrotha_Core::value2hash('action='.$action.'&backend='.$backend->getBackendName()));</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($action);</span>
<span style="color: #00A000">+ $text = $a->appendChild($text);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function begin($item) {</span>
<span style="color: #00A000">+ $this->_xml = new DOMDocument('1.0');</span>
<span style="color: #00A000">+ $root = $this->_xml->createElement('html');</span>
<span style="color: #00A000">+ $root = $this->_xml->appendChild($root);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $head = $this->_xml->createElement('head');</span>
<span style="color: #00A000">+ $head = $root->appendChild($head);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $title = $this->_xml->createElement('title');</span>
<span style="color: #00A000">+ $title = $head->appendChild($title);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($item->getDisplayName());</span>
<span style="color: #00A000">+ $text = $title->appendChild($text);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $style = $this->_xml->createElement('link');</span>
<span style="color: #00A000">+ $style = $head->appendChild($style);</span>
<span style="color: #00A000">+ $style->setAttribute('type', 'text/css');</span>
<span style="color: #00A000">+ $style->setAttribute('rel', 'stylesheet');</span>
<span style="color: #00A000">+ $style->setAttribute('href', $this->rootURL().'static/default.css');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $script = $this->_xml->createElement('script');</span>
<span style="color: #00A000">+ $script = $head->appendChild($script);</span>
<span style="color: #00A000">+ $script->setAttribute('type', 'text/javascript');</span>
<span style="color: #00A000">+ $script->setAttribute('src', $this->rootURL().'static/dynamic.js');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $this->_body = $this->_xml->createElement('body');</span>
<span style="color: #00A000">+ $this->_body = $root->appendChild($this->_body);</span>
<span style="color: #00A000">+ $this->_body->setAttribute('onload', 'bodyLoaded();');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $this->_mediaListElement = $this->_xml->createElement('ul');</span>
<span style="color: #00A000">+ $this->_mediaListElement = $this->_body->appendChild($this->_mediaListElement);</span>
<span style="color: #00A000">+ $this->_mediaListElement->setAttribute('id', 'mediaListElement');</span>
<span style="color: #00A000">+ if ($parent = $item->getParent()) {</span>
<span style="color: #00A000">+ $this->addItem($parent);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function addItem($item) {</span>
<span style="color: #00A000">+ $url = $this->rootURL().'?'.</span>
<span style="color: #00A000">+ MediaBrotha_Core::value2hash(</span>
<span style="color: #00A000">+ 'mime_type='.urlencode($item->getMimeType()).'&'.</span>
<span style="color: #00A000">+ ($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').</span>
<span style="color: #00A000">+ 'uri='.urlencode($item->getURI()));</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $li = $this->_xml->createElement('li');</span>
<span style="color: #00A000">+ $li = $this->_mediaListElement->appendChild($li);</span>
<span style="color: #00A000">+ $li->setAttribute('class', 'mediaElement');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $a = $this->_xml->createElement('a');</span>
<span style="color: #00A000">+ $a = $li->appendChild($a);</span>
<span style="color: #00A000">+ $a->setAttribute('href', $url);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $text = $this->_xml->createTextNode($item->getDisplayName());</span>
<span style="color: #00A000">+ $text = $a->appendChild($text);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $ul = $this->_xml->createElement('ul');</span>
<span style="color: #00A000">+ $ul = $li->appendChild($ul);</span>
<span style="color: #00A000">+ $ul->setAttribute('class', 'mediaActionsListElement');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $this->_mediaActionLinks($ul, $item, 'li');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function finish($item) {</span>
<span style="color: #00A000">+ $this->_actionsListElement = $this->_xml->createElement('ul');</span>
<span style="color: #00A000">+ $this->_actionsListElement = $this->_body->appendChild($this->_actionsListElement);</span>
<span style="color: #00A000">+ $this->_actionsListElement->setAttribute('id', 'actionsListElement');</span>
<span style="color: #00A000">+ $this->_mediaActionLinks($this->_actionsListElement, $item, 'li');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function render() {</span>
<span style="color: #00A000">+ print $this->_xml->saveHTML();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: various enhancements
<span style="color: #A00000">- add a HTML frontend</span>
<span style="color: #A00000">- frontend choosen automaticaly depending on browser</span>
<span style="color: #A00000">- handling of parent media</span>
<span style="color: #A00000">- max length for metadata and display_name</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/index.php b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #000080; font-weight: bold">index d142ff5..137b409 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #800080; font-weight: bold">@@ -35,7 +35,11 @@ require_once('MediaBrotha/Core.php');</span>
// Init
MediaBrotha_Core::init();
<span style="color: #A00000">-MediaBrotha_Core::connectFrontend('CiscoXML', Array('push_url' => 'http://cisco:cisco@192.168.0.220/CGI/Execute'));</span>
<span style="color: #00A000">+if (CiscoIPPhone::userAgentIsCiscoIPPhone()) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::connectFrontend('CiscoXML', Array('push_url' => 'http://cisco:cisco@192.168.0.220/CGI/Execute'));</span>
<span style="color: #00A000">+} else {</span>
<span style="color: #00A000">+ MediaBrotha_Core::connectFrontend('HTML');</span>
<span style="color: #00A000">+}</span>
// Backends
MediaBrotha_Core::loadBackend('FileSystem', Array('base_path' => '/home/share/music/'));
<span style="color: #800080; font-weight: bold">@@ -51,10 +55,9 @@ $ldap_connect_config = Array(</span>
MediaBrotha_Core::loadBackend('LDAP', Array('ldap_connect_config' => $ldap_connect_config));
// Roots
<span style="color: #A00000">-MediaBrotha_Core::addRootMedia('file:///home/share/music/', Array('name'=> 'Fichiers'));</span>
<span style="color: #A00000">-MediaBrotha_Core::addRootMedia('ldap:///', Array('name'=> 'Annuaire'));</span>
<span style="color: #00A000">+MediaBrotha_Core::addRootMedia('file:///home/share/music/', Array('display_name'=> 'Fichiers'));</span>
<span style="color: #00A000">+MediaBrotha_Core::addRootMedia('ldap:///', Array('display_name'=> 'Annuaire'));</span>
MediaBrotha_Core::go();
<span style="color: #A00000">-</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #000080; font-weight: bold">index c711f9c..216aad6 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #800080; font-weight: bold">@@ -23,6 +23,12 @@ This file is part of XML services for Cisco IP Phones.</span>
/**
* @author Mathieu Parent
*/
<span style="color: #00A000">+class CiscoIPPhone {</span>
<span style="color: #00A000">+ static public function userAgentIsCiscoIPPhone() {</span>
<span style="color: #00A000">+ return preg_match('/^Allegro-Software-WebClient\//', $_SERVER['HTTP_USER_AGENT']);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
class CiscoXMLField {
private $_allowed_fields = NULL;
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #000080; font-weight: bold">index 84a6a89..28a8441 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -71,12 +71,17 @@ class MediaBrotha_Backend {</span>
}
// Actions
<span style="color: #A00000">- public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ public function getMediaActions(MediaBrotha_Media $media) {</span>
return Array();
}
public function doMediaAction($action, MediaBrotha_Media $media) {
return false;
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Populate</span>
<span style="color: #00A000">+ public function populateMedia(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #000080; font-weight: bold">index 39928b4..006814b 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #800080; font-weight: bold">@@ -40,10 +40,13 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
// Browsing
public function mediaFromBufferItem($file) {
if ($file) {
<span style="color: #00A000">+ if ($file->getFilename() === '..') {</span>
<span style="color: #00A000">+ return NULL;</span>
<span style="color: #00A000">+ }</span>
$media = new MediaBrotha_Media(
'file://'.realpath($file->getPathname()),
Array(
<span style="color: #A00000">- 'name' => $file->getFilename(),</span>
<span style="color: #00A000">+ 'display_name' => $file->getFilename(),</span>
'hidden' => !$file->isReadable() || preg_match('/^\.([^.]|$)/', $file->getFilename()),
)
);
<span style="color: #800080; font-weight: bold">@@ -59,31 +62,47 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
}
public function fetch(MediaBrotha_Media $media) {
<span style="color: #A00000">- $uri =$media->getURI();</span>
<span style="color: #00A000">+ $uri = $media->getURI();</span>
if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {
<span style="color: #A00000">- $uri = 'file://'.$this->getMetadata('base_path');</span>
<span style="color: #00A000">+ $uri = 'file://'.$this->getParam('base_path');</span>
}
$path = parse_url($uri, PHP_URL_PATH);
if (is_dir($path)) {
return new MediaBrotha_MediaIterator($this, $media, new DirectoryIterator($path));
} else {
<span style="color: #A00000">- $this->setURI(NULL);</span>
return false;
}
}
// Actions
<span style="color: #A00000">- public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- if ($mime_type === 'application/x-directory') {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'browse',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- } elseif ($uri && (substr($uri, 0, 7) === 'file://')) {</span>
<span style="color: #00A000">+ protected function _isHandled(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ return ($media->getMimeType() === 'application/x-directory')</span>
<span style="color: #00A000">+ || (substr($media->getURI(), 0, 7) === 'file://');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function getMediaActions(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ if ($this->_isHandled($media)) {</span>
return Array(
'browse',
);
} else {
<span style="color: #A00000">- return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
<span style="color: #00A000">+ return parent::getMediaActions($media);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Populate</span>
<span style="color: #00A000">+ public function populateMedia(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ if ($this->_isHandled($media)) {</span>
<span style="color: #00A000">+ $parent_path = 'file://'.dirname(parse_url($media->getURI(), PHP_URL_PATH));</span>
<span style="color: #00A000">+ if ($this->isURISafe($parent_path)) {</span>
<span style="color: #00A000">+ $media->setParent(</span>
<span style="color: #00A000">+ new MediaBrotha_Media($parent_path,</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'display_name' => '..',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #000080; font-weight: bold">index c882dd7..365e78e 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #800080; font-weight: bold">@@ -54,7 +54,7 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
$media = new MediaBrotha_Media(
'ldap:///'.$entry->dn(),
Array(
<span style="color: #A00000">- 'name' => $entry->dn(), //$entry->getValue('sn', 'single'),</span>
<span style="color: #00A000">+ 'display_name' => $entry->dn(), //$entry->getValue('sn', 'single'),</span>
),
'text/directory'
//$finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING);
<span style="color: #800080; font-weight: bold">@@ -79,17 +79,18 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
return true;
}
// Actions
<span style="color: #A00000">- public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- if ($mime_type === 'text/directory') {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'browse',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- } elseif ($uri && (substr($uri, 0, 7) === 'ldap://')) {</span>
<span style="color: #00A000">+ protected function _isHandled(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ return ($media->getMimeType() === 'text/directory')</span>
<span style="color: #00A000">+ || (substr($media->getURI(), 0, 7) === 'ldap://');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function getMediaActions(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ if ($this->_isHandled($media)) {</span>
return Array(
'browse',
);
} else {
<span style="color: #A00000">- return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
<span style="color: #00A000">+ return parent::getMediaActions($media);</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #000080; font-weight: bold">index addba42..9616be8 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #800080; font-weight: bold">@@ -30,11 +30,18 @@ class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
public function __construct($params = NULL) {
parent::__construct($params);
<span style="color: #A00000">- $this->_media = new MediaBrotha_Media('MediaBrotha:///');</span>
<span style="color: #00A000">+ $this->_media = new MediaBrotha_Media('MediaBrotha:///',</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'display_name' => 'Root',</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
$this->_media_iterator = new MediaBrotha_MediaIterator($this, $this->_media);
}
<span style="color: #A00000">- public function addRootMedia($media) {</span>
<span style="color: #00A000">+ public function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ $this->addRootMediaObj(new MediaBrotha_Media($URI, $metadata, $mime_type,$mime_encoding));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function addRootMediaObj($media) {</span>
$this->_media_iterator->bufferAdd($media);
}
<span style="color: #800080; font-weight: bold">@@ -42,13 +49,6 @@ class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
public function fetch(MediaBrotha_Media $media) {
return $this->_media_iterator;
}
<span style="color: #A00000">-</span>
<span style="color: #A00000">- // Actions</span>
<span style="color: #A00000">- public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index 2b4e7c6..8c3208e 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -50,17 +50,13 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
}
// Actions
<span style="color: #A00000">- public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- if (in_array($mime_type, Array($this::$_supported_mime_types))) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'play_media',</span>
<span style="color: #A00000">- 'pause_media',</span>
<span style="color: #A00000">- 'stop_media',</span>
<span style="color: #A00000">- 'enqueue_media',</span>
<span style="color: #A00000">- 'next_media',</span>
<span style="color: #A00000">- 'previous_media',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- } elseif ($uri && (substr($uri, 0, 7) === 'file://')) {</span>
<span style="color: #00A000">+ protected function _isHandled(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ return in_array($media->getMimeType(), Array($this::$_supported_mime_types))</span>
<span style="color: #00A000">+ || (substr($media->getURI(), 0, 7) === 'file://');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function getMediaActions(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ if ($this->_isHandled($media)) {</span>
return Array(
'play_media',
'pause_media',
<span style="color: #800080; font-weight: bold">@@ -70,7 +66,7 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
'previous_media',
);
} else {
<span style="color: #A00000">- return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
<span style="color: #00A000">+ return parent::getMediaActions($media);</span>
}
}
public function doMediaAction($action, MediaBrotha_Media $media) {
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index 5ec90e8..8997a7c 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -34,47 +34,17 @@ class MediaBrotha_Core {</span>
private static $_backends = Array();
private static $_media = NULL;
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Core</span>
<span style="color: #00A000">+ */</span>
public static function init() {
if (!session_start()) {
die('Unable to start session');
}
<span style="color: #A00000">- if (!isset($_SESSION['HASHES'])) {</span>
<span style="color: #A00000">- $_SESSION['HASHES'] = Array();</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- if (isset($_SERVER["QUERY_STRING"])) {</span>
<span style="color: #A00000">- $tmp = explode('&', $_SERVER["QUERY_STRING"]);</span>
<span style="color: #A00000">- foreach ($tmp as $h) {</span>
<span style="color: #A00000">- if (preg_match('/^[a-z0-9]+$/', $h)) {</span>
<span style="color: #A00000">- if ($s = MediaBrotha_Core::hash2string($h)) {</span>
<span style="color: #A00000">- parse_str($s, $output);</span>
<span style="color: #A00000">- $_GET = array_merge($_GET, $output);</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+ MediaBrotha_Core::_unhashRequest();</span>
MediaBrotha_Core::loadBackend('Root');
}
<span style="color: #A00000">- public static function hash2string($h) {</span>
<span style="color: #A00000">- if (isset($_SESSION['HASHES'][$h])) {</span>
<span style="color: #A00000">- return $_SESSION['HASHES'][$h];</span>
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- //print 'NO string for hash '.$h;</span>
<span style="color: #A00000">- return NULL;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public static function string2hash($s) {</span>
<span style="color: #A00000">- for($hash_length = 1 ; $hash_length <=41 ; $hash_length++) {</span>
<span style="color: #A00000">- $h = substr(sha1($s), 0, $hash_length);</span>
<span style="color: #A00000">- if (!isset($_SESSION['HASHES'][$h]) || ($_SESSION['HASHES'][$h] === $s)) {</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- $_SESSION['HASHES'][$h] = $s;</span>
<span style="color: #A00000">- return $h;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
public static function go() {
$current_backend = MediaBrotha_Core::getCurrentBackend();
$current_media = MediaBrotha_Core::getCurrentMedia();
<span style="color: #800080; font-weight: bold">@@ -82,7 +52,7 @@ class MediaBrotha_Core {</span>
if ($media_iterator = $current_backend->fetch($current_media)) {
MediaBrotha_Core::$_frontend->begin($current_media);
foreach ($media_iterator as $item) {
<span style="color: #A00000">- if ($item->isHidden()) {</span>
<span style="color: #00A000">+ if (($item === NULL) || $item->isHidden()) {</span>
continue;
}
MediaBrotha_Core::$_frontend->addItem($item);
<span style="color: #800080; font-weight: bold">@@ -97,10 +67,9 @@ class MediaBrotha_Core {</span>
}
public function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {
<span style="color: #A00000">- MediaBrotha_Core::$_backends['Root']->addRootMedia(</span>
<span style="color: #A00000">- new MediaBrotha_Media($URI, $metadata, $mime_type,$mime_encoding)</span>
<span style="color: #A00000">- );</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_backends['Root']->addRootMedia($URI, $metadata, $mime_type, $mime_encoding);</span>
}
<span style="color: #00A000">+</span>
/*
* Backends
*/
<span style="color: #800080; font-weight: bold">@@ -120,22 +89,7 @@ class MediaBrotha_Core {</span>
public static function getBackends() {
return MediaBrotha_Core::$_backends;
}
<span style="color: #A00000">- public static function getCurrentBackend() {</span>
<span style="color: #A00000">- if (!empty($_GET['backend']) && !empty(MediaBrotha_Core::$_backends[$_GET['backend']])) {</span>
<span style="color: #A00000">- return MediaBrotha_Core::$_backends[$_GET['backend']];</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #A00000">- foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentURI()) as $action) {</span>
<span style="color: #A00000">- if ($backend->getBackendName() == 'Root') {</span>
<span style="color: #A00000">- continue;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- if ($action === MediaBrotha_Core::getAction()) {</span>
<span style="color: #A00000">- return $backend;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- return MediaBrotha_Core::$_backends['Root'];</span>
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+</span>
/*
* Frontend
*/
<span style="color: #800080; font-weight: bold">@@ -151,8 +105,26 @@ class MediaBrotha_Core {</span>
MediaBrotha_Core::$_frontend = new $class_name($args);
}
/*
<span style="color: #A00000">- * ...</span>
<span style="color: #00A000">+ * Current *</span>
*/
<span style="color: #00A000">+ public static function getCurrentBackend() {</span>
<span style="color: #00A000">+ if (!empty($_GET['backend']) && !empty(MediaBrotha_Core::$_backends[$_GET['backend']])) {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends[$_GET['backend']];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $current_media = MediaBrotha_Core::getCurrentMedia();</span>
<span style="color: #00A000">+ foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions($current_media) as $action) {</span>
<span style="color: #00A000">+ if ($backend->getBackendName() == 'Root') {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if ($action === MediaBrotha_Core::getAction()) {</span>
<span style="color: #00A000">+ return $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends['Root'];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
public static function getAction() {
if (!empty($_GET['action'])) {
return $_GET['action'];
<span style="color: #800080; font-weight: bold">@@ -161,17 +133,63 @@ class MediaBrotha_Core {</span>
}
}
<span style="color: #A00000">- public static function getCurrentURI() {</span>
<span style="color: #A00000">- if (!empty($_GET['uri'])) {</span>
<span style="color: #A00000">- return (string) $_GET['uri'];</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- }</span>
public static function getCurrentMedia() {
if (empty(MediaBrotha_Core::$_media)) {
<span style="color: #A00000">- MediaBrotha_Core::$_media = new MediaBrotha_Media(MediaBrotha_Core::getCurrentURI());</span>
<span style="color: #00A000">+ if (!empty($_GET['uri'])) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_media = new MediaBrotha_Media($_GET['uri']);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_media = new MediaBrotha_Media('MediaBrotha:///');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #00A000">+ $backend->populateMedia(MediaBrotha_Core::$_media);</span>
<span style="color: #00A000">+ }</span>
}
return MediaBrotha_Core::$_media;
}
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * helper functions</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ /* hashes */</span>
<span style="color: #00A000">+ public static function hash2value($h) {</span>
<span style="color: #00A000">+ if (isset($_SESSION['HASHES'][$h])) {</span>
<span style="color: #00A000">+ return $_SESSION['HASHES'][$h];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return NULL;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function value2hash($v) {</span>
<span style="color: #00A000">+ for($hash_length = 1 ; $hash_length <=41 ; $hash_length++) {</span>
<span style="color: #00A000">+ $h = substr(sha1($v), 0, $hash_length);</span>
<span style="color: #00A000">+ if (!isset($_SESSION['HASHES'][$h]) || ($_SESSION['HASHES'][$h] === $v)) {</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $_SESSION['HASHES'][$h] = $v;</span>
<span style="color: #00A000">+ return $h;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function hash2array($h) {</span>
<span style="color: #00A000">+ if ($v = MediaBrotha_Core::hash2value($h)) {</span>
<span style="color: #00A000">+ parse_str($v, $output);</span>
<span style="color: #00A000">+ return $output;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ private static function _unhashRequest() {</span>
<span style="color: #00A000">+ if (!isset($_SESSION['HASHES'])) {</span>
<span style="color: #00A000">+ $_SESSION['HASHES'] = Array();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if (isset($_SERVER["QUERY_STRING"])) {</span>
<span style="color: #00A000">+ $tmp = explode('&', $_SERVER["QUERY_STRING"]);</span>
<span style="color: #00A000">+ foreach ($tmp as $h) {</span>
<span style="color: #00A000">+ if (preg_match('/^[a-z0-9]+$/', $h)) {</span>
<span style="color: #00A000">+ $_GET = array_merge($_GET, MediaBrotha_Core::hash2array($h));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index 2baa6af..914e6ee 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -30,12 +30,15 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
private $_xml = NULL;
public function begin($item) {
$this->_xml = new CiscoIPPhoneMenu();
<span style="color: #A00000">- $this->_xml->setCiscoElement('Title', $item->getDisplayName());</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('Title', $item->getDisplayName(32));</span>
$this->_xml->setCiscoElement('Prompt', substr($item->getURI(), -32));
<span style="color: #00A000">+ if ($parent = $item->getParent()) {</span>
<span style="color: #00A000">+ $this->addItem($parent);</span>
<span style="color: #00A000">+ }</span>
}
public function addItem($item) {
$url = $this->rootURL().'?'.
<span style="color: #A00000">- MediaBrotha_Core::string2hash(</span>
<span style="color: #00A000">+ MediaBrotha_Core::value2hash(</span>
'mime_type='.urlencode($item->getMimeType()).'&'.
($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').
'uri='.urlencode($item->getURI()));
<span style="color: #800080; font-weight: bold">@@ -49,10 +52,10 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
'URL' => 'SoftKey:Select',
'Position' => $pos++));
foreach (MediaBrotha_Core::getBackends() as $backend) {
<span style="color: #A00000">- foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentURI()) as $action) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentMedia()) as $action) {</span>
$this->_xml->setCiscoElement('SoftKeyItem',
Array('Name' => $action,
<span style="color: #A00000">- 'URL' => 'QueryStringParam:'.MediaBrotha_Core::string2hash('action='.$action.'&backend='.$backend->getBackendName()),</span>
<span style="color: #00A000">+ 'URL' => 'QueryStringParam:'.MediaBrotha_Core::value2hash('action='.$action.'&backend='.$backend->getBackendName()),</span>
'Position' => $pos++));
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Media.php b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #000080; font-weight: bold">index 6efd1db..7964473 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,14 +25,15 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Media {
<span style="color: #A00000">- private $_metadata = Array();</span>
<span style="color: #A00000">-</span>
private $_URI = NULL;
<span style="color: #00A000">+ private $_metadata = Array();</span>
private $_mimeType = NULL;
private $_mimeEncoding = NULL;
<span style="color: #00A000">+ private $_parent = NULL;</span>
<span style="color: #00A000">+</span>
public function __construct($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {
<span style="color: #A00000">- $this->setURI($URI);</span>
<span style="color: #00A000">+ $this->_URI = $URI;</span>
$this->setMetadata($metadata);
$this->setMimeType($mime_type);
$this->setMimeEncoding($mime_encoding);
<span style="color: #800080; font-weight: bold">@@ -42,16 +43,17 @@ class MediaBrotha_Media {</span>
public function getURI() {
return $this->_URI;
}
<span style="color: #A00000">- public function setURI($URI) {</span>
<span style="color: #A00000">- $this->_URI = $URI;</span>
<span style="color: #A00000">- }</span>
/* metadata */
<span style="color: #A00000">- public function getMetadata($name = NULL) {</span>
<span style="color: #00A000">+ public function getMetadata($name = NULL, $max_length = NULL) {</span>
if ($name === NULL) {
return $this->_metadata;
} elseif (isset($this->_metadata[$name])) {
<span style="color: #A00000">- return $this->_metadata[$name];</span>
<span style="color: #00A000">+ if ($max_length) {</span>
<span style="color: #00A000">+ return substr($this->_metadata[$name], 0, $max_length);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return $this->_metadata[$name];</span>
<span style="color: #00A000">+ }</span>
} else {
return NULL;
}
<span style="color: #800080; font-weight: bold">@@ -60,6 +62,17 @@ class MediaBrotha_Media {</span>
if (is_array($name)) {
$this->_metadata = $name;
} else {
<span style="color: #00A000">+ switch($name) {</span>
<span style="color: #00A000">+ case 'hidden':</span>
<span style="color: #00A000">+ case 'display_name':</span>
<span style="color: #00A000">+ case 'Array':</span>
<span style="color: #00A000">+ //music</span>
<span style="color: #00A000">+ case 'artist':</span>
<span style="color: #00A000">+ case 'album':</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ print "Unusual metadata '$name'.\n";</span>
<span style="color: #00A000">+ }</span>
$this->_metadata[$name] = $value;
}
<span style="color: #800080; font-weight: bold">@@ -81,10 +94,22 @@ class MediaBrotha_Media {</span>
$this->_mimeEncoding = $mime_encoding;
}
<span style="color: #00A000">+ /* parent */</span>
<span style="color: #00A000">+ public function getParent() {</span>
<span style="color: #00A000">+ return $this->_parent;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function setParent($parent) {</span>
<span style="color: #00A000">+ $this->_parent = $parent;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
/* Most used metadata */
<span style="color: #A00000">- public function getDisplayName($max_length = 0) {</span>
<span style="color: #A00000">- if ($name = $this->getMetadata('name')) {</span>
<span style="color: #A00000">- return $name;</span>
<span style="color: #00A000">+ public function getDisplayName($max_length = NULL) {</span>
<span style="color: #00A000">+ if ($name = $this->getMetadata('display_name')) {</span>
<span style="color: #00A000">+ if ($max_length) {</span>
<span style="color: #00A000">+ return substr($name, 0, $max_length);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return $name;</span>
<span style="color: #00A000">+ }</span>
} else {
return '?';
}
<span style="color: #800080; font-weight: bold">@@ -97,13 +122,3 @@ class MediaBrotha_Media {</span>
}
}
<span style="color: #A00000">-/*</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-Mandatory metadata:</span>
<span style="color: #A00000">-uri</span>
<span style="color: #A00000">-name</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-Usual metadata:</span>
<span style="color: #A00000">-artist</span>
<span style="color: #A00000">-album</span>
<span style="color: #A00000">-*/</span>
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrother: lot of changes
<span style="color: #A00000">- Separate Backend from Iterator</span>
<span style="color: #A00000">- Reduce size of reply by using hashes in session</span>
<span style="color: #A00000">- ...</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/index.php b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #000080; font-weight: bold">index 1f0ae25..d142ff5 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #800080; font-weight: bold">@@ -33,10 +33,26 @@ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.'../lib');</span>
require('Cisco-XML/Cisco-XML.php');
require_once('MediaBrotha/Core.php');
<span style="color: #00A000">+// Init</span>
MediaBrotha_Core::init();
MediaBrotha_Core::connectFrontend('CiscoXML', Array('push_url' => 'http://cisco:cisco@192.168.0.220/CGI/Execute'));
<span style="color: #00A000">+</span>
<span style="color: #00A000">+// Backends</span>
MediaBrotha_Core::loadBackend('FileSystem', Array('base_path' => '/home/share/music/'));
MediaBrotha_Core::loadBackend('VLC', Array('http_intf' => 'http://127.0.0.1:8080'));
<span style="color: #00A000">+$ldap_connect_config = Array(</span>
<span style="color: #00A000">+ 'host' => '127.0.0.1',</span>
<span style="color: #00A000">+ //'binddn' => 'cn=nobody,cn=internal,dc=example,dc=org',</span>
<span style="color: #00A000">+ //'bindpw' => 'not24get',</span>
<span style="color: #00A000">+ 'basedn' => 'dc=sathieu,dc=net',</span>
<span style="color: #00A000">+ 'filter' => '(objectClass=*)',</span>
<span style="color: #00A000">+ 'scope' => 'one',</span>
<span style="color: #00A000">+);</span>
<span style="color: #00A000">+MediaBrotha_Core::loadBackend('LDAP', Array('ldap_connect_config' => $ldap_connect_config));</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+// Roots</span>
<span style="color: #00A000">+MediaBrotha_Core::addRootMedia('file:///home/share/music/', Array('name'=> 'Fichiers'));</span>
<span style="color: #00A000">+MediaBrotha_Core::addRootMedia('ldap:///', Array('name'=> 'Annuaire'));</span>
MediaBrotha_Core::go();
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #000080; font-weight: bold">index 2253ca9..c711f9c 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #800080; font-weight: bold">@@ -125,7 +125,10 @@ class CiscoXMLObject {</span>
);
$context = stream_context_create($opts);
<span style="color: #A00000">- return file_get_contents($url, false, $context);</span>
<span style="color: #00A000">+ $stream = fopen($url, 'r', false, $context);</span>
<span style="color: #00A000">+ if ($stream !== false) {</span>
<span style="color: #00A000">+ return stream_get_contents($stream);</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #000080; font-weight: bold">index bb1fe8f..84a6a89 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -26,80 +26,56 @@ This file is part of MediaBrotha.</span>
require_once('MediaBrotha/Media.php');
<span style="color: #A00000">-class MediaBrotha_Backend extends MediaBrotha_Media implements Iterator {</span>
<span style="color: #A00000">- protected $_buffer = Array();</span>
<span style="color: #A00000">- public function __construct(array $args = Array()) {</span>
<span style="color: #A00000">- parent::__construct($args);</span>
<span style="color: #00A000">+class MediaBrotha_Backend {</span>
<span style="color: #00A000">+ protected $_params = NULL;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function __construct($params = NULL) {</span>
<span style="color: #00A000">+ $this->setParam($params);</span>
$this->register();
<span style="color: #A00000">- $this->setMimeType('application/x-mediabrotha-backend-'.strtolower($this->getName()));</span>
<span style="color: #A00000">- MediaBrotha_Core::registerMimeType($this, 'application/x-mediabrotha-backend-'.strtolower($this->getName()));</span>
<span style="color: #A00000">- $this->setMetadata('name', $this->getName());</span>
<span style="color: #A00000">- $this->setMetadata('uri', 'MediaBrotha_Backend://'.$this->getName());</span>
}
<span style="color: #A00000">- public function register() {</span>
<span style="color: #A00000">- MediaBrotha_Core::registerBackend($this);</span>
<span style="color: #00A000">+ /* params */</span>
<span style="color: #00A000">+ public function getParam($name = NULL) {</span>
<span style="color: #00A000">+ if ($name === NULL) {</span>
<span style="color: #00A000">+ return $this->_params;</span>
<span style="color: #00A000">+ } elseif (isset($this->_params[$name])) {</span>
<span style="color: #00A000">+ return $this->_params[$name];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return NULL;</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #00A000">+ public function setParam($name, $value = NULL) {</span>
<span style="color: #00A000">+ if (is_array($name)) {</span>
<span style="color: #00A000">+ $this->_params = $name;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $this->_params[$name] = $value;</span>
<span style="color: #A00000">- public function getName() {</span>
<span style="color: #A00000">- return preg_replace('/^MediaBrotha_Backend_(.*)$/', '$1', get_class($this));</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #A00000">- public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array();</span>
<span style="color: #00A000">+ public function register() {</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerBackend($this);</span>
}
<span style="color: #A00000">- public function isHidden() {</span>
<span style="color: #A00000">- return parent::isHidden() || !in_array('browse', $this->capabilities());</span>
<span style="color: #00A000">+ public function getBackendName() {</span>
<span style="color: #00A000">+ return preg_replace('/^MediaBrotha_Backend_(.*)$/', '$1', get_class($this));</span>
}
<span style="color: #A00000">- // Capability browse</span>
<span style="color: #A00000">- protected function _mediaFromBufferItem($item) {</span>
<span style="color: #00A000">+ // Browsing</span>
<span style="color: #00A000">+ public function mediaFromBufferItem($item) {</span>
return $item;
}
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #00A000">+ public function fetch(MediaBrotha_Media $media) {</span>
return false;
}
<span style="color: #A00000">- public function rewind() {</span>
<span style="color: #A00000">- $this->_buffer->rewind();</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function current() {</span>
<span style="color: #A00000">- return $this->_mediaFromBufferItem($this->_buffer->current());</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function key() {</span>
<span style="color: #A00000">- return $this->_buffer->key();</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function next() {</span>
<span style="color: #A00000">- return $this->_mediaFromBufferItem($this->_buffer->next());</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function valid() {</span>
<span style="color: #A00000">- return $this->_buffer->valid();</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array();</span>
}
<span style="color: #A00000">- // Capability play</span>
<span style="color: #A00000">- public function play(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function pause() {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function stop() {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- // Capability playlist</span>
<span style="color: #A00000">- public function playlistEnqueue(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function playlistNext(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return false;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function playlistPrevious(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ public function doMediaAction($action, MediaBrotha_Media $media) {</span>
return false;
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #000080; font-weight: bold">index 0dc8972..39928b4 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,14 +25,10 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {
<span style="color: #A00000">- public function register() {</span>
<span style="color: #A00000">- parent::register();</span>
<span style="color: #A00000">- MediaBrotha_Core::registerMimeType($this, 'application/x-directory');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ // Helper functions</span>
public function isURISafe($uri) {
$real_path = realpath(parse_url($uri, PHP_URL_PATH));
<span style="color: #A00000">- $real_base_path = realpath($this->getMetadata('base_path'));</span>
<span style="color: #00A000">+ $real_base_path = realpath($this->getParam('base_path'));</span>
do {
if ($real_path === $real_base_path) {
return true;
<span style="color: #800080; font-weight: bold">@@ -41,19 +37,16 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
return false;
}
<span style="color: #A00000">- public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'browse',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- // Capability browse</span>
<span style="color: #A00000">- protected function _mediaFromBufferItem($file) {</span>
<span style="color: #00A000">+ // Browsing</span>
<span style="color: #00A000">+ public function mediaFromBufferItem($file) {</span>
if ($file) {
<span style="color: #A00000">- $media = new MediaBrotha_Media(Array(</span>
<span style="color: #A00000">- 'uri' => 'file://'.realpath($file->getPathname()),</span>
<span style="color: #A00000">- 'name' => $file->getFilename(),</span>
<span style="color: #A00000">- 'hidden' => !$file->isReadable() || preg_match('/^\.([^.]|$)/', $file->getFilename()),</span>
<span style="color: #A00000">- ));</span>
<span style="color: #00A000">+ $media = new MediaBrotha_Media(</span>
<span style="color: #00A000">+ 'file://'.realpath($file->getPathname()),</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'name' => $file->getFilename(),</span>
<span style="color: #00A000">+ 'hidden' => !$file->isReadable() || preg_match('/^\.([^.]|$)/', $file->getFilename()),</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
if ($file->isDir()) {
$media->setMimeType('application/x-directory');
} else {
<span style="color: #800080; font-weight: bold">@@ -65,12 +58,34 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
}
}
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #00A000">+ public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ $uri =$media->getURI();</span>
if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {
$uri = 'file://'.$this->getMetadata('base_path');
}
<span style="color: #A00000">- $this->_buffer = new DirectoryIterator(parse_url($uri, PHP_URL_PATH));</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #00A000">+ $path = parse_url($uri, PHP_URL_PATH);</span>
<span style="color: #00A000">+ if (is_dir($path)) {</span>
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, $media, new DirectoryIterator($path));</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $this->setURI(NULL);</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ if ($mime_type === 'application/x-directory') {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } elseif ($uri && (substr($uri, 0, 7) === 'file://')) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #000080; font-weight: bold">index d275ff1..c882dd7 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #800080; font-weight: bold">@@ -29,27 +29,16 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
private $_ldap;
public function __construct(array $args = Array()) {
parent::__construct($args);
<span style="color: #A00000">- $this->_ldap = Net_LDAP2::connect($this->getMetadata('ldap_connect_config'));</span>
<span style="color: #00A000">+ $this->_ldap = Net_LDAP2::connect($this->getParam('ldap_connect_config'));</span>
if (Net_LDAP2::isError($this->_ldap)) {
die('Could not fetch entry: '.$this->_ldap->getMessage());
}
}
<span style="color: #A00000">- public function register() {</span>
<span style="color: #A00000">- parent::register();</span>
<span style="color: #A00000">- MediaBrotha_Core::registerMimeType($this, 'text/directory');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'browse',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ // Helper functions</span>
public function isURISafe($uri) {
return true;
}
<span style="color: #A00000">- </span>
<span style="color: #A00000">- </span>
<span style="color: #00A000">+</span>
public static function parseLDAPURI($uri, $component = NULL) {
$uri = preg_replace('@^ldap:///@', 'ldap://fake_host/', $uri);
$components = parse_url($uri, $component);
<span style="color: #800080; font-weight: bold">@@ -59,30 +48,50 @@ class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
return $components;
}
<span style="color: #A00000">- // Capability browse</span>
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #00A000">+ // Browsing</span>
<span style="color: #00A000">+ public function mediaFromBufferItem($entry) {</span>
<span style="color: #00A000">+ if ($entry) {</span>
<span style="color: #00A000">+ $media = new MediaBrotha_Media(</span>
<span style="color: #00A000">+ 'ldap:///'.$entry->dn(),</span>
<span style="color: #00A000">+ Array(</span>
<span style="color: #00A000">+ 'name' => $entry->dn(), //$entry->getValue('sn', 'single'),</span>
<span style="color: #00A000">+ ),</span>
<span style="color: #00A000">+ 'text/directory'</span>
<span style="color: #00A000">+ //$finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING);</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ return $media;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ $uri = $media->getURI();</span>
if (($this::parseLDAPURI($uri, PHP_URL_SCHEME) != 'ldap') || !$this->isURISafe($uri)) {
<span style="color: #A00000">- $ldap_connect_config = $this->getMetadata('ldap_connect_config');</span>
<span style="color: #00A000">+ $ldap_connect_config = $this->getParam('ldap_connect_config');</span>
$uri = 'ldap:///'.$ldap_connect_config['basedn'];
}
$basedn = $this::parseLDAPURI($uri, PHP_URL_PATH);
if ($basedn && ($basedn{0} = '/')) {
<span style="color: #A00000">- $basedn = substr($basedn, 1); </span>
<span style="color: #00A000">+ $basedn = substr($basedn, 1);</span>
}
<span style="color: #A00000">- $this->_buffer = $this->_ldap->search($basedn, NULL,</span>
<span style="color: #00A000">+ $ldap_search = $this->_ldap->search($basedn, NULL,</span>
Array());
<span style="color: #00A000">+ return new MediaBrotha_MediaIterator($this, $media, $ldap_search);</span>
return true;
}
<span style="color: #A00000">- protected function _mediaFromBufferItem($entry) {</span>
<span style="color: #A00000">- if ($entry) {</span>
<span style="color: #A00000">- $media = new MediaBrotha_Media(Array(</span>
<span style="color: #A00000">- 'uri' => 'ldap:///'.$entry->dn(),</span>
<span style="color: #A00000">- 'name' => $entry->dn(), //$entry->getValue('sn', 'single'),</span>
<span style="color: #A00000">- ));</span>
<span style="color: #A00000">- $media->setMimeType('text/directory');</span>
<span style="color: #A00000">- // $media->setMimeEncoding($finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING));</span>
<span style="color: #A00000">- return $media;</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ if ($mime_type === 'text/directory') {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } elseif ($uri && (substr($uri, 0, 7) === 'ldap://')) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
}
}
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #000080; font-weight: bold">index 5357cc3..addba42 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,22 +25,28 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Backend_Root extends MediaBrotha_Backend {
<span style="color: #A00000">- public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'browse',</span>
<span style="color: #A00000">- );</span>
<span style="color: #00A000">+ private $_media = NULL;</span>
<span style="color: #00A000">+ private $_media_iterator = NULL;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function __construct($params = NULL) {</span>
<span style="color: #00A000">+ parent::__construct($params);</span>
<span style="color: #00A000">+ $this->_media = new MediaBrotha_Media('MediaBrotha:///');</span>
<span style="color: #00A000">+ $this->_media_iterator = new MediaBrotha_MediaIterator($this, $this->_media);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function addRootMedia($media) {</span>
<span style="color: #00A000">+ $this->_media_iterator->bufferAdd($media);</span>
}
<span style="color: #A00000">- public function isHidden() {</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Browsing</span>
<span style="color: #00A000">+ public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ return $this->_media_iterator;</span>
}
<span style="color: #A00000">- // Capability browse</span>
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #A00000">- $this->_buffer = new ArrayIterator();</span>
<span style="color: #A00000">- foreach(MediaBrotha_Core::getBackends() as $id => $backend) {</span>
<span style="color: #A00000">- $this->_buffer[] = $backend;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ );</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index df10f93..2b4e7c6 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,20 +25,14 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {
<span style="color: #A00000">- public function register() {</span>
<span style="color: #A00000">- parent::register();</span>
<span style="color: #A00000">- MediaBrotha_Core::registerMimeType($this, 'audio/mpeg');</span>
<span style="color: #A00000">- MediaBrotha_Core::registerMimeType($this, 'video/x-msvideo');</span>
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+ static protected $_supported_mime_types = Array(</span>
<span style="color: #00A000">+ 'audio/mpeg',</span>
<span style="color: #00A000">+ 'video/x-msvideo',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #A00000">- public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #A00000">- return Array(</span>
<span style="color: #A00000">- 'play',</span>
<span style="color: #A00000">- 'playlist',</span>
<span style="color: #A00000">- );</span>
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+ // Helper functions</span>
private function send_command($command, array $args = Array()) {
<span style="color: #A00000">- $url = $this->getMetadata('http_intf').</span>
<span style="color: #00A000">+ $url = $this->getParam('http_intf').</span>
'/requests/status.xml'.
'?command='.$command;
foreach ($args as $k => $v) {
<span style="color: #800080; font-weight: bold">@@ -49,31 +43,53 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
print $output.'<!--'.$url."-->\n";
}
<span style="color: #A00000">- // Capability browse</span>
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #A00000">- $this->_buffer[] = new MediaBrotha_Media();</span>
<span style="color: #00A000">+ // Browsing</span>
<span style="color: #00A000">+ public function fetch(MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ $this->_buffer[] = $media;</span>
return true;
}
<span style="color: #A00000">- // Capability play</span>
<span style="color: #A00000">- public function play(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return $this->send_command('in_play', Array('input' => $media->getURI()));</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function pause() {</span>
<span style="color: #A00000">- return $this->send_command('pl_pause');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function stop() {</span>
<span style="color: #A00000">- return $this->send_command('pl_stop');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- // Capability playlist</span>
<span style="color: #A00000">- public function playlistEnqueue(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return $this->send_command('in_enqueue', Array('input' => $media->getURI()));</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function playlistNext(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return $this->send_command('pl_next');</span>
<span style="color: #00A000">+ // Actions</span>
<span style="color: #00A000">+ public function getMediaActions($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ if (in_array($mime_type, Array($this::$_supported_mime_types))) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'play_media',</span>
<span style="color: #00A000">+ 'pause_media',</span>
<span style="color: #00A000">+ 'stop_media',</span>
<span style="color: #00A000">+ 'enqueue_media',</span>
<span style="color: #00A000">+ 'next_media',</span>
<span style="color: #00A000">+ 'previous_media',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } elseif ($uri && (substr($uri, 0, 7) === 'file://')) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'play_media',</span>
<span style="color: #00A000">+ 'pause_media',</span>
<span style="color: #00A000">+ 'stop_media',</span>
<span style="color: #00A000">+ 'enqueue_media',</span>
<span style="color: #00A000">+ 'next_media',</span>
<span style="color: #00A000">+ 'previous_media',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return parent::getMediaActions($uri, $mime_type, $mime_encoding);</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #A00000">- public function playlistPrevious(MediaBrotha_Media $media) {</span>
<span style="color: #A00000">- return $this->send_command('pl_previous');</span>
<span style="color: #00A000">+ public function doMediaAction($action, MediaBrotha_Media $media) {</span>
<span style="color: #00A000">+ switch($action) {</span>
<span style="color: #00A000">+ case 'play_media':</span>
<span style="color: #00A000">+ return $this->send_command('in_play', Array('input' => $media->getURI()));</span>
<span style="color: #00A000">+ case 'pause_media':</span>
<span style="color: #00A000">+ return $this->send_command('pl_pause');</span>
<span style="color: #00A000">+ case 'stop_media':</span>
<span style="color: #00A000">+ return $this->send_command('pl_stop');</span>
<span style="color: #00A000">+ case 'enqueue_media':</span>
<span style="color: #00A000">+ return $this->send_command('in_enqueue', Array('input' => $media->getURI()));</span>
<span style="color: #00A000">+ case 'next_media':</span>
<span style="color: #00A000">+ return $this->send_command('pl_next');</span>
<span style="color: #00A000">+ case 'previous_media':</span>
<span style="color: #00A000">+ return $this->send_command('pl_previous');</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ return parent::doMediaAction($action, $media);</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index b3eaa84..5ec90e8 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -27,53 +27,80 @@ This file is part of MediaBrotha.</span>
require_once('MediaBrotha/Backend.php');
require_once('MediaBrotha/Frontend.php');
require_once('MediaBrotha/Media.php');
<span style="color: #00A000">+require_once('MediaBrotha/MediaIterator.php');</span>
class MediaBrotha_Core {
private static $_frontend = NULL;
private static $_backends = Array();
<span style="color: #A00000">- private static $_mime_types = Array();</span>
private static $_media = NULL;
public static function init() {
<span style="color: #00A000">+ if (!session_start()) {</span>
<span style="color: #00A000">+ die('Unable to start session');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if (!isset($_SESSION['HASHES'])) {</span>
<span style="color: #00A000">+ $_SESSION['HASHES'] = Array();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if (isset($_SERVER["QUERY_STRING"])) {</span>
<span style="color: #00A000">+ $tmp = explode('&', $_SERVER["QUERY_STRING"]);</span>
<span style="color: #00A000">+ foreach ($tmp as $h) {</span>
<span style="color: #00A000">+ if (preg_match('/^[a-z0-9]+$/', $h)) {</span>
<span style="color: #00A000">+ if ($s = MediaBrotha_Core::hash2string($h)) {</span>
<span style="color: #00A000">+ parse_str($s, $output);</span>
<span style="color: #00A000">+ $_GET = array_merge($_GET, $output);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
MediaBrotha_Core::loadBackend('Root');
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function hash2string($h) {</span>
<span style="color: #00A000">+ if (isset($_SESSION['HASHES'][$h])) {</span>
<span style="color: #00A000">+ return $_SESSION['HASHES'][$h];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ //print 'NO string for hash '.$h;</span>
<span style="color: #00A000">+ return NULL;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function string2hash($s) {</span>
<span style="color: #00A000">+ for($hash_length = 1 ; $hash_length <=41 ; $hash_length++) {</span>
<span style="color: #00A000">+ $h = substr(sha1($s), 0, $hash_length);</span>
<span style="color: #00A000">+ if (!isset($_SESSION['HASHES'][$h]) || ($_SESSION['HASHES'][$h] === $s)) {</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $_SESSION['HASHES'][$h] = $s;</span>
<span style="color: #00A000">+ return $h;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
public static function go() {
$current_backend = MediaBrotha_Core::getCurrentBackend();
<span style="color: #A00000">- switch(MediaBrotha_Core::getAction()) {</span>
<span style="color: #A00000">- case 'play':</span>
<span style="color: #A00000">- $current_backend->play(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'pause':</span>
<span style="color: #A00000">- $current_backend->pause(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'stop':</span>
<span style="color: #A00000">- $current_backend->stop(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'pl_enqueue':</span>
<span style="color: #A00000">- $current_backend->playlistEnqueue(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'pl_next':</span>
<span style="color: #A00000">- $current_backend->playlistNext(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'pl_previous':</span>
<span style="color: #A00000">- $current_backend->playlistPrevious(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #A00000">- break;</span>
<span style="color: #A00000">- case 'browse':</span>
<span style="color: #A00000">- default:</span>
<span style="color: #A00000">- $current_uri = MediaBrotha_Core::getCurrentURI();</span>
<span style="color: #A00000">- $current_backend->fetch((string) $current_uri);</span>
<span style="color: #A00000">- MediaBrotha_Core::$_frontend->begin($current_backend);</span>
<span style="color: #A00000">- foreach($current_backend as $item) {</span>
<span style="color: #00A000">+ $current_media = MediaBrotha_Core::getCurrentMedia();</span>
<span style="color: #00A000">+ if (MediaBrotha_Core::getAction() == 'browse') {</span>
<span style="color: #00A000">+ if ($media_iterator = $current_backend->fetch($current_media)) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->begin($current_media);</span>
<span style="color: #00A000">+ foreach ($media_iterator as $item) {</span>
if ($item->isHidden()) {
continue;
}
MediaBrotha_Core::$_frontend->addItem($item);
}
<span style="color: #A00000">- MediaBrotha_Core::$_frontend->finish($current_backend);</span>
<span style="color: #A00000">- MediaBrotha_Core::$_frontend->render();</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->finish($current_media);</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->render($current_media);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $current_backend->doMediaAction(MediaBrotha_Core::getAction(), $current_media);</span>
}
}
<span style="color: #00A000">+ public function addRootMedia($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_backends['Root']->addRootMedia(</span>
<span style="color: #00A000">+ new MediaBrotha_Media($URI, $metadata, $mime_type,$mime_encoding)</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
/*
* Backends
*/
<span style="color: #800080; font-weight: bold">@@ -85,20 +112,29 @@ class MediaBrotha_Core {</span>
return new $class_name($args);
}
public static function registerBackend($backend) {
<span style="color: #A00000">- MediaBrotha_Core::$_backends[] = $backend;</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_backends[$backend->getBackendName()] = $backend;</span>
}
<span style="color: #A00000">- public static function registerMimeType($backend, $mime_type) {</span>
<span style="color: #A00000">- MediaBrotha_Core::$_mime_types[$mime_type][] = $backend;</span>
<span style="color: #00A000">+ public static function getBackend($name) {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends[$name];</span>
}
public static function getBackends() {
return MediaBrotha_Core::$_backends;
}
public static function getCurrentBackend() {
<span style="color: #A00000">- if (!empty($_GET['mime_type']) && !empty(MediaBrotha_Core::$_mime_types[$_GET['mime_type']])) {</span>
<span style="color: #A00000">- return MediaBrotha_Core::$_mime_types[$_GET['mime_type']][0];</span>
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- return MediaBrotha_Core::$_backends[0];</span>
<span style="color: #00A000">+ if (!empty($_GET['backend']) && !empty(MediaBrotha_Core::$_backends[$_GET['backend']])) {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends[$_GET['backend']];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentURI()) as $action) {</span>
<span style="color: #00A000">+ if ($backend->getBackendName() == 'Root') {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ if ($action === MediaBrotha_Core::getAction()) {</span>
<span style="color: #00A000">+ return $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
}
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends['Root'];</span>
}
/*
* Frontend
<span style="color: #800080; font-weight: bold">@@ -132,8 +168,7 @@ class MediaBrotha_Core {</span>
}
public static function getCurrentMedia() {
if (empty(MediaBrotha_Core::$_media)) {
<span style="color: #A00000">- MediaBrotha_Core::$_media = new MediaBrotha_Media();</span>
<span style="color: #A00000">- MediaBrotha_Core::$_media->setURI(MediaBrotha_Core::getCurrentURI());</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_media = new MediaBrotha_Media(MediaBrotha_Core::getCurrentURI());</span>
}
return MediaBrotha_Core::$_media;
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #000080; font-weight: bold">index 84ce7b7..2cc6060 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #800080; font-weight: bold">@@ -26,9 +26,9 @@ This file is part of MediaBrotha.</span>
class MediaBrotha_Frontend {
protected $_infos = NULL;
<span style="color: #00A000">+</span>
public function __construct(array $args = Array()) {
$this->_infos = $args;
}
}
<span style="color: #A00000">-</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index ce2f711..2baa6af 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,44 +24,48 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend {</span>
<span style="color: #00A000">+require_once('HTTP.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend_HTTP {</span>
private $_xml = NULL;
public function begin($item) {
$this->_xml = new CiscoIPPhoneMenu();
$this->_xml->setCiscoElement('Title', $item->getDisplayName());
<span style="color: #A00000">- //$this->_xml->setCiscoElement('Prompt', 'kk');</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('Prompt', substr($item->getURI(), -32));</span>
}
public function addItem($item) {
<span style="color: #A00000">- $url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'].'?'.</span>
<span style="color: #A00000">- 'mime_type='.urlencode($item->getMimeType()).'&'.</span>
<span style="color: #A00000">- ($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').</span>
<span style="color: #A00000">- 'uri='.urlencode($item->getURI());</span>
<span style="color: #A00000">- //$url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];</span>
<span style="color: #00A000">+ $url = $this->rootURL().'?'.</span>
<span style="color: #00A000">+ MediaBrotha_Core::string2hash(</span>
<span style="color: #00A000">+ 'mime_type='.urlencode($item->getMimeType()).'&'.</span>
<span style="color: #00A000">+ ($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').</span>
<span style="color: #00A000">+ 'uri='.urlencode($item->getURI()));</span>
$this->_xml->setCiscoElement('MenuItem',
Array('Name' => $item->getDisplayName(), 'URL' => $url));
}
<span style="color: #A00000">- public function finish() {</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Select', 'URL' => 'SoftKey:Select', 'Position' => '1'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Play', 'URL' => 'QueryStringParam:action=play', 'Position' => '2'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Pause', 'URL' => 'QueryStringParam:action=pause', 'Position' => '3'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Stop', 'URL' => 'QueryStringParam:action=stop', 'Position' => '4'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_enqueue', 'Position' => '5'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Next', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));</span>
<span style="color: #A00000">- $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #A00000">- Array('Name' => 'Previous', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));</span>
<span style="color: #00A000">+ public function finish($item) {</span>
<span style="color: #00A000">+ $pos = 1;</span>
$this->_xml->setCiscoElement('SoftKeyItem',
<span style="color: #A00000">- Array('Name' => 'Quit', 'URL' => 'SoftKey:Exit', 'Position' => '8'));</span>
<span style="color: #00A000">+ Array('Name' => 'Select',</span>
<span style="color: #00A000">+ 'URL' => 'SoftKey:Select',</span>
<span style="color: #00A000">+ 'Position' => $pos++));</span>
<span style="color: #00A000">+ foreach (MediaBrotha_Core::getBackends() as $backend) {</span>
<span style="color: #00A000">+ foreach ($backend->getMediaActions(MediaBrotha_Core::getCurrentURI()) as $action) {</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => $action,</span>
<span style="color: #00A000">+ 'URL' => 'QueryStringParam:'.MediaBrotha_Core::string2hash('action='.$action.'&backend='.$backend->getBackendName()),</span>
<span style="color: #00A000">+ 'Position' => $pos++));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
}
public function render() {
<span style="color: #A00000">- CiscoXMLObject::HttpHeader();</span>
<span style="color: #A00000">- print $this->_xml;</span>
<span style="color: #A00000">- //$this->_xml->execute($this->_infos['push_url']);</span>
<span style="color: #00A000">+ if (true) {</span>
<span style="color: #00A000">+ CiscoXMLObject::HttpHeader();</span>
<span style="color: #00A000">+ print $this->_xml;</span>
<span style="color: #00A000">+ //print "\n<!--".strlen($this->_xml).'-->';</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ print strlen($this->_xml)."\n";</span>
<span style="color: #00A000">+ print $this->_xml->execute($this->_infos['push_url']);</span>
<span style="color: #00A000">+ }</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php</span>
similarity index 77%
copy from sathieu/cisco-xml/lib/MediaBrotha/Frontend.php
copy to sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php
<span style="color: #000080; font-weight: bold">index 84ce7b7..de19bf7 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php</span>
<span style="color: #800080; font-weight: bold">@@ -24,11 +24,10 @@ This file is part of MediaBrotha.</span>
* @author Mathieu Parent
*/
<span style="color: #A00000">-class MediaBrotha_Frontend {</span>
<span style="color: #A00000">- protected $_infos = NULL;</span>
<span style="color: #A00000">- public function __construct(array $args = Array()) {</span>
<span style="color: #A00000">- $this->_infos = $args;</span>
<span style="color: #00A000">+class MediaBrotha_Frontend_HTTP extends MediaBrotha_Frontend {</span>
<span style="color: #00A000">+ public function rootURL() {</span>
<span style="color: #00A000">+ $url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];</span>
<span style="color: #00A000">+ $url = preg_replace('/index\.php$/', '', $url);</span>
<span style="color: #00A000">+ return $url;</span>
}
}
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Media.php b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #000080; font-weight: bold">index cf3d66d..6efd1db 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #800080; font-weight: bold">@@ -26,25 +26,27 @@ This file is part of MediaBrotha.</span>
class MediaBrotha_Media {
private $_metadata = Array();
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ private $_URI = NULL;</span>
private $_mimeType = NULL;
private $_mimeEncoding = NULL;
<span style="color: #A00000">- public function __construct(array $metadata = Array()) {</span>
<span style="color: #A00000">- $this->_metadata = $metadata;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function setMimeType($mime_type) {</span>
<span style="color: #A00000">- $this->_mimeType = $mime_type;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- public function getMimeType() {</span>
<span style="color: #A00000">- // TODO</span>
<span style="color: #A00000">- return $this->_mimeType;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function __construct($URI, array $metadata = Array(), $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ $this->setURI($URI);</span>
<span style="color: #00A000">+ $this->setMetadata($metadata);</span>
<span style="color: #00A000">+ $this->setMimeType($mime_type);</span>
<span style="color: #00A000">+ $this->setMimeEncoding($mime_encoding);</span>
}
<span style="color: #A00000">- public function setMimeEncoding($mime_encoding) {</span>
<span style="color: #A00000">- $this->_mimeEncoding = $mime_encoding;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* URI */</span>
<span style="color: #00A000">+ public function getURI() {</span>
<span style="color: #00A000">+ return $this->_URI;</span>
}
<span style="color: #A00000">- public function getMimeEncoding() {</span>
<span style="color: #A00000">- // TODO</span>
<span style="color: #A00000">- return $this->_mimeEncoding;</span>
<span style="color: #00A000">+ public function setURI($URI) {</span>
<span style="color: #00A000">+ $this->_URI = $URI;</span>
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* metadata */</span>
public function getMetadata($name = NULL) {
if ($name === NULL) {
return $this->_metadata;
<span style="color: #800080; font-weight: bold">@@ -54,7 +56,7 @@ class MediaBrotha_Media {</span>
return NULL;
}
}
<span style="color: #A00000">- public function setMetadata($name, $value) {</span>
<span style="color: #00A000">+ public function setMetadata($name, $value = NULL) {</span>
if (is_array($name)) {
$this->_metadata = $name;
} else {
<span style="color: #800080; font-weight: bold">@@ -62,21 +64,36 @@ class MediaBrotha_Media {</span>
}
}
<span style="color: #A00000">- /* Most used metadata */</span>
<span style="color: #A00000">- public function getDisplayName($max_length = 0) {</span>
<span style="color: #A00000">- return $this->getMetadata('name');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* mimeType */</span>
<span style="color: #00A000">+ public function getMimeType() {</span>
<span style="color: #00A000">+ return $this->_mimeType;</span>
}
<span style="color: #A00000">- public function getURI() {</span>
<span style="color: #A00000">- return $this->getMetadata('uri');</span>
<span style="color: #00A000">+ public function setMimeType($mime_type) {</span>
<span style="color: #00A000">+ $this->_mimeType = $mime_type;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* mimeEncoding */</span>
<span style="color: #00A000">+ public function getMimeEncoding() {</span>
<span style="color: #00A000">+ return $this->_mimeEncoding;</span>
}
<span style="color: #A00000">- public function setURI($value) {</span>
<span style="color: #A00000">- return $this->setMetadata('uri', $value);</span>
<span style="color: #00A000">+ public function setMimeEncoding($mime_encoding) {</span>
<span style="color: #00A000">+ $this->_mimeEncoding = $mime_encoding;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* Most used metadata */</span>
<span style="color: #00A000">+ public function getDisplayName($max_length = 0) {</span>
<span style="color: #00A000">+ if ($name = $this->getMetadata('name')) {</span>
<span style="color: #00A000">+ return $name;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return '?';</span>
<span style="color: #00A000">+ }</span>
}
public function getURIComponent($component) {
return parse_url($this->getURI($component));
}
public function isHidden() {
<span style="color: #A00000">- return isset($this->_metadata['hidden']) && $this->_metadata['hidden'];</span>
<span style="color: #00A000">+ return (bool) $this->getMetadata('hidden');</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php b/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..096759a</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,71 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+require_once('MediaBrotha/Media.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_MediaIterator implements Iterator {</span>
<span style="color: #00A000">+ private $_backend = NULL;</span>
<span style="color: #00A000">+ private $_media = NULL;</span>
<span style="color: #00A000">+ private $_handle = NULL;</span>
<span style="color: #00A000">+ protected $_buffer = NULL;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function __construct(MediaBrotha_Backend $backend, MediaBrotha_Media $media, $buffer = NULL) {</span>
<span style="color: #00A000">+ $this->_backend = $backend;</span>
<span style="color: #00A000">+ $this->_media = $media;</span>
<span style="color: #00A000">+ if ($buffer) {</span>
<span style="color: #00A000">+ $this->_buffer = $buffer;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $this->_buffer = new ArrayIterator();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* buffer */</span>
<span style="color: #00A000">+ public function bufferAdd($media) {</span>
<span style="color: #00A000">+ $this->_buffer[] = $media;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* iterator */</span>
<span style="color: #00A000">+ public function rewind() {</span>
<span style="color: #00A000">+ $this->_buffer->rewind();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function current() {</span>
<span style="color: #00A000">+ return $this->_backend->mediaFromBufferItem($this->_buffer->current());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function key() {</span>
<span style="color: #00A000">+ return $this->_buffer->key();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function next() {</span>
<span style="color: #00A000">+ return $this->_backend->mediaFromBufferItem($this->_buffer->next());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function valid() {</span>
<span style="color: #00A000">+ return $this->_buffer->valid();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: adding LDAP backend
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..d275ff1</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,88 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+require_once('Net/LDAP2.php');</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Backend_LDAP extends MediaBrotha_Backend {</span>
<span style="color: #00A000">+ private $_ldap;</span>
<span style="color: #00A000">+ public function __construct(array $args = Array()) {</span>
<span style="color: #00A000">+ parent::__construct($args);</span>
<span style="color: #00A000">+ $this->_ldap = Net_LDAP2::connect($this->getMetadata('ldap_connect_config'));</span>
<span style="color: #00A000">+ if (Net_LDAP2::isError($this->_ldap)) {</span>
<span style="color: #00A000">+ die('Could not fetch entry: '.$this->_ldap->getMessage());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function register() {</span>
<span style="color: #00A000">+ parent::register();</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerMimeType($this, 'text/directory');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function isURISafe($uri) {</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ public static function parseLDAPURI($uri, $component = NULL) {</span>
<span style="color: #00A000">+ $uri = preg_replace('@^ldap:///@', 'ldap://fake_host/', $uri);</span>
<span style="color: #00A000">+ $components = parse_url($uri, $component);</span>
<span style="color: #00A000">+ if (is_array($components) && ($components['host'] === 'fake_host')) {</span>
<span style="color: #00A000">+ $components['host'] = NULL;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return $components;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability browse</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ if (($this::parseLDAPURI($uri, PHP_URL_SCHEME) != 'ldap') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ $ldap_connect_config = $this->getMetadata('ldap_connect_config');</span>
<span style="color: #00A000">+ $uri = 'ldap:///'.$ldap_connect_config['basedn'];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $basedn = $this::parseLDAPURI($uri, PHP_URL_PATH);</span>
<span style="color: #00A000">+ if ($basedn && ($basedn{0} = '/')) {</span>
<span style="color: #00A000">+ $basedn = substr($basedn, 1); </span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $this->_buffer = $this->_ldap->search($basedn, NULL,</span>
<span style="color: #00A000">+ Array());</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ protected function _mediaFromBufferItem($entry) {</span>
<span style="color: #00A000">+ if ($entry) {</span>
<span style="color: #00A000">+ $media = new MediaBrotha_Media(Array(</span>
<span style="color: #00A000">+ 'uri' => 'ldap:///'.$entry->dn(),</span>
<span style="color: #00A000">+ 'name' => $entry->dn(), //$entry->getValue('sn', 'single'),</span>
<span style="color: #00A000">+ ));</span>
<span style="color: #00A000">+ $media->setMimeType('text/directory');</span>
<span style="color: #00A000">+ // $media->setMimeEncoding($finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING));</span>
<span style="color: #00A000">+ return $media;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
MediaBrotha: Rewrite backend logic a bit
And:
<span style="color: #A00000">- use type hinting</span>
<span style="color: #A00000">- MediaBrotha_Backend::_buffer is an Iterator</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #000080; font-weight: bold">index f85001b..bb1fe8f 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,7 +28,7 @@ require_once('MediaBrotha/Media.php');</span>
class MediaBrotha_Backend extends MediaBrotha_Media implements Iterator {
protected $_buffer = Array();
<span style="color: #A00000">- public function __construct($args = Array()) {</span>
<span style="color: #00A000">+ public function __construct(array $args = Array()) {</span>
parent::__construct($args);
$this->register();
$this->setMimeType('application/x-mediabrotha-backend-'.strtolower($this->getName()));
<span style="color: #800080; font-weight: bold">@@ -54,34 +54,36 @@ class MediaBrotha_Backend extends MediaBrotha_Media implements Iterator {</span>
}
// Capability browse
<span style="color: #00A000">+ protected function _mediaFromBufferItem($item) {</span>
<span style="color: #00A000">+ return $item;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
public function fetch($uri) {
return false;
}
public function rewind() {
<span style="color: #A00000">- reset($this->_buffer);</span>
<span style="color: #00A000">+ $this->_buffer->rewind();</span>
}
public function current() {
<span style="color: #A00000">- return current($this->_buffer);</span>
<span style="color: #00A000">+ return $this->_mediaFromBufferItem($this->_buffer->current());</span>
}
public function key() {
<span style="color: #A00000">- return key($this->_buffer);</span>
<span style="color: #00A000">+ return $this->_buffer->key();</span>
}
public function next() {
<span style="color: #A00000">- return next($this->_buffer);</span>
<span style="color: #00A000">+ return $this->_mediaFromBufferItem($this->_buffer->next());</span>
}
public function valid() {
<span style="color: #A00000">- $key = key($this->_buffer);</span>
<span style="color: #A00000">- $var = ($key !== NULL && $key !== FALSE);</span>
<span style="color: #A00000">- return $var;</span>
<span style="color: #00A000">+ return $this->_buffer->valid();</span>
}
// Capability play
<span style="color: #A00000">- public function play($media) {</span>
<span style="color: #00A000">+ public function play(MediaBrotha_Media $media) {</span>
return false;
}
public function pause() {
<span style="color: #800080; font-weight: bold">@@ -91,13 +93,13 @@ class MediaBrotha_Backend extends MediaBrotha_Media implements Iterator {</span>
return false;
}
// Capability playlist
<span style="color: #A00000">- public function playlistEnqueue($media) {</span>
<span style="color: #00A000">+ public function playlistEnqueue(MediaBrotha_Media $media) {</span>
return false;
}
<span style="color: #A00000">- public function playlistNext($media) {</span>
<span style="color: #00A000">+ public function playlistNext(MediaBrotha_Media $media) {</span>
return false;
}
<span style="color: #A00000">- public function playlistPrevious($media) {</span>
<span style="color: #00A000">+ public function playlistPrevious(MediaBrotha_Media $media) {</span>
return false;
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #000080; font-weight: bold">index 62fcb6f..0dc8972 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #800080; font-weight: bold">@@ -41,20 +41,13 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
return false;
}
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #A00000">- if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {</span>
<span style="color: #A00000">- $uri = 'file://'.$this->getMetadata('base_path');</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- $this->_buffer = new DirectoryIterator(parse_url($uri, PHP_URL_PATH));</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #A00000">- }</span>
public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {
return Array(
'browse',
);
}
<span style="color: #A00000">- // Iterator</span>
<span style="color: #A00000">- public function mediaFromFile($file) {</span>
<span style="color: #00A000">+ // Capability browse</span>
<span style="color: #00A000">+ protected function _mediaFromBufferItem($file) {</span>
if ($file) {
$media = new MediaBrotha_Media(Array(
'uri' => 'file://'.realpath($file->getPathname()),
<span style="color: #800080; font-weight: bold">@@ -72,16 +65,12 @@ class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
}
}
<span style="color: #A00000">- public function current() {</span>
<span style="color: #A00000">- return $this->mediaFromFile($this->_buffer->current());</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function next() {</span>
<span style="color: #A00000">- return $this->mediaFromFile($this->_buffer->next());</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- public function valid() {</span>
<span style="color: #A00000">- return $this->_buffer->valid();</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ $uri = 'file://'.$this->getMetadata('base_path');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $this->_buffer = new DirectoryIterator(parse_url($uri, PHP_URL_PATH));</span>
<span style="color: #00A000">+ return true;</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #000080; font-weight: bold">index 5e9c5fb..5357cc3 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,13 +25,6 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Backend_Root extends MediaBrotha_Backend {
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #A00000">- $this->_buffer = Array();</span>
<span style="color: #A00000">- foreach(MediaBrotha_Core::getBackends() as $id => $backend) {</span>
<span style="color: #A00000">- $this->_buffer[] = $backend;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #A00000">- }</span>
public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {
return Array(
'browse',
<span style="color: #800080; font-weight: bold">@@ -40,6 +33,16 @@ class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
public function isHidden() {
return true;
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability browse</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ $this->_buffer = new ArrayIterator();</span>
<span style="color: #00A000">+ foreach(MediaBrotha_Core::getBackends() as $id => $backend) {</span>
<span style="color: #00A000">+ $this->_buffer[] = $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index 12cbff6..df10f93 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -31,28 +31,32 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
MediaBrotha_Core::registerMimeType($this, 'video/x-msvideo');
}
<span style="color: #A00000">- public function fetch($uri) {</span>
<span style="color: #A00000">- $this->_buffer[] = new MediaBrotha_Media();</span>
<span style="color: #A00000">- return true;</span>
<span style="color: #A00000">- }</span>
public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {
return Array(
'play',
'playlist',
);
}
<span style="color: #A00000">- private function send_command($command, $args = Array()) {</span>
<span style="color: #00A000">+ private function send_command($command, array $args = Array()) {</span>
$url = $this->getMetadata('http_intf').
'/requests/status.xml'.
'?command='.$command;
foreach ($args as $k => $v) {
$url.= '&'.$k.'='.rawurlencode($v);
}
<span style="color: #A00000">- return fopen($url, 'r');</span>
<span style="color: #00A000">+ $output = file_get_contents($url);</span>
<span style="color: #00A000">+ Header('Content-Type: text/xml');</span>
<span style="color: #00A000">+ print $output.'<!--'.$url."-->\n";</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability browse</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ $this->_buffer[] = new MediaBrotha_Media();</span>
<span style="color: #00A000">+ return true;</span>
}
// Capability play
<span style="color: #A00000">- public function play($media) {</span>
<span style="color: #00A000">+ public function play(MediaBrotha_Media $media) {</span>
return $this->send_command('in_play', Array('input' => $media->getURI()));
}
public function pause() {
<span style="color: #800080; font-weight: bold">@@ -62,13 +66,13 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
return $this->send_command('pl_stop');
}
// Capability playlist
<span style="color: #A00000">- public function playlistEnqueue($media) {</span>
<span style="color: #00A000">+ public function playlistEnqueue(MediaBrotha_Media $media) {</span>
return $this->send_command('in_enqueue', Array('input' => $media->getURI()));
}
<span style="color: #A00000">- public function playlistNext($media) {</span>
<span style="color: #00A000">+ public function playlistNext(MediaBrotha_Media $media) {</span>
return $this->send_command('pl_next');
}
<span style="color: #A00000">- public function playlistPrevious($media) {</span>
<span style="color: #00A000">+ public function playlistPrevious(MediaBrotha_Media $media) {</span>
return $this->send_command('pl_previous');
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #000080; font-weight: bold">index e31ee47..b3eaa84 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -60,7 +60,8 @@ class MediaBrotha_Core {</span>
break;
case 'browse':
default:
<span style="color: #A00000">- $current_backend->fetch(MediaBrotha_Core::getCurrentURI());</span>
<span style="color: #00A000">+ $current_uri = MediaBrotha_Core::getCurrentURI();</span>
<span style="color: #00A000">+ $current_backend->fetch((string) $current_uri);</span>
MediaBrotha_Core::$_frontend->begin($current_backend);
foreach($current_backend as $item) {
if ($item->isHidden()) {
<span style="color: #800080; font-weight: bold">@@ -126,7 +127,7 @@ class MediaBrotha_Core {</span>
public static function getCurrentURI() {
if (!empty($_GET['uri'])) {
<span style="color: #A00000">- return $_GET['uri'];</span>
<span style="color: #00A000">+ return (string) $_GET['uri'];</span>
}
}
public static function getCurrentMedia() {
<span style="color: #800080; font-weight: bold">@@ -136,5 +137,6 @@ class MediaBrotha_Core {</span>
}
return MediaBrotha_Core::$_media;
}
<span style="color: #00A000">+</span>
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #000080; font-weight: bold">index 9eab63c..84ce7b7 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #800080; font-weight: bold">@@ -25,10 +25,8 @@ This file is part of MediaBrotha.</span>
*/
class MediaBrotha_Frontend {
<span style="color: #A00000">- protected $_browser = NULL;</span>
protected $_infos = NULL;
<span style="color: #A00000">- public function __construct($browser, $args = Array()) {</span>
<span style="color: #A00000">- $this->_browser = $browser;</span>
<span style="color: #00A000">+ public function __construct(array $args = Array()) {</span>
$this->_infos = $args;
}
}
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Media.php b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #000080; font-weight: bold">index 0b50a52..cf3d66d 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,7 +28,7 @@ class MediaBrotha_Media {</span>
private $_metadata = Array();
private $_mimeType = NULL;
private $_mimeEncoding = NULL;
<span style="color: #A00000">- public function __construct($metadata = Array()) {</span>
<span style="color: #00A000">+ public function __construct(array $metadata = Array()) {</span>
$this->_metadata = $metadata;
}
public function setMimeType($mime_type) {
<span style="color: #800080; font-weight: bold">@@ -63,7 +63,7 @@ class MediaBrotha_Media {</span>
}
}
/* Most used metadata */
<span style="color: #A00000">- public function getDisplayName() {</span>
<span style="color: #00A000">+ public function getDisplayName($max_length = 0) {</span>
return $this->getMetadata('name');
}
public function getURI() {
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Added auto jitterbuffer to sofia settings
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #000080; font-weight: bold">index f33d963..0a5d2c7 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #800080; font-weight: bold">@@ -57,6 +57,7 @@ namespace FSClient {</span>
new Field(Field.FIELD_TYPE.Int,"SIP Port","sip-port","sip-port","12346","Advanced"),
new Field(Field.FIELD_TYPE.Int,"DTMF Duration","dtmf-duration","dtmf-duration","2000","Advanced"),
new Field(Field.FIELD_TYPE.Bool,"STUN Enabled","stun-enabled","stun-enabled","true","Advanced"),
<span style="color: #00A000">+ new Field(Field.FIELD_TYPE.Int,"Jitter Buffer","auto-jitterbuffer-msec","auto-jitterbuffer-msec","60","Advanced"),</span>
/*Advanced Less Important*/
new Field(Field.FIELD_TYPE.Int,"Max Proceeding","max-proceeding","max-proceeding","3","Advanced"),
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
FSClient remove redundant setup
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #000080; font-weight: bold">index acfcb35..acc41b5 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #800080; font-weight: bold">@@ -101,6 +101,6 @@</span>
</Target>
-->
<Target Name="AfterBuild">
<span style="color: #A00000">- <GenerateBootstrapper ApplicationFile="$(TargetFileName)" ApplicationName="FSClient Setup" BootstrapperItems="@(BootstrapperFile)" ComponentsLocation="HomeSite" CopyComponents="True" OutputPath="$(OutputPath)" Path="C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\" /></span>
<span style="color: #00A000">+ <GenerateBootstrapper ApplicationFile="$(TargetFileName)" ApplicationName="FSClient" BootstrapperItems="@(BootstrapperFile)" ComponentsLocation="HomeSite" CopyComponents="True" OutputPath="$(OutputPath)" Path="C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\" /></span>
</Target>
</Project>
\ No newline at end of file
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
Cisco-XML: add ms-video support for VLC
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index 03f5360..12cbff6 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,6 +28,7 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
public function register() {
parent::register();
MediaBrotha_Core::registerMimeType($this, 'audio/mpeg');
<span style="color: #00A000">+ MediaBrotha_Core::registerMimeType($this, 'video/x-msvideo');</span>
}
public function fetch($uri) {
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
Cisco-XML: correct typos
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index a0a9078..ce2f711 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -52,9 +52,9 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend {</span>
$this->_xml->setCiscoElement('SoftKeyItem',
Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_enqueue', 'Position' => '5'));
$this->_xml->setCiscoElement('SoftKeyItem',
<span style="color: #A00000">- Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));</span>
<span style="color: #00A000">+ Array('Name' => 'Next', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));</span>
$this->_xml->setCiscoElement('SoftKeyItem',
<span style="color: #A00000">- Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));</span>
<span style="color: #00A000">+ Array('Name' => 'Previous', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));</span>
$this->_xml->setCiscoElement('SoftKeyItem',
Array('Name' => 'Quit', 'URL' => 'SoftKey:Exit', 'Position' => '8'));
}
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Removed DX patch it is now in trunk
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/External Items/portaudio_dx_win.patch b/mitchcapper/FSClient/External Items/portaudio_dx_win.patch</span>
deleted file mode 100644
<span style="color: #000080; font-weight: bold">index 21c1caf..0000000</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/External Items/portaudio_dx_win.patch </span>
<span style="color: #00A000">+++ /dev/null</span>
<span style="color: #800080; font-weight: bold">@@ -1,426 +0,0 @@</span>
<span style="color: #A00000">-diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln</span>
<span style="color: #A00000">-index edee701..464cb2e 100644</span>
<span style="color: #A00000">---- a/Freeswitch.2010.sln</span>
<span style="color: #A00000">-+++ b/Freeswitch.2010.sln</span>
<span style="color: #A00000">-@@ -1569,18 +1569,18 @@ Global</span>
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.Build.0 = Release DirectSound|x64</span>
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x86 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64</span>
<span style="color: #A00000">-diff --git a/libs/portaudio/build/msvc/portaudio.2010.vcxproj b/libs/portaudio/build/msvc/portaudio.2010.vcxproj</span>
<span style="color: #A00000">-index b4eca56..10b4c25 100644</span>
<span style="color: #A00000">---- a/libs/portaudio/build/msvc/portaudio.2010.vcxproj</span>
<span style="color: #A00000">-+++ b/libs/portaudio/build/msvc/portaudio.2010.vcxproj</span>
<span style="color: #A00000">-@@ -41,11 +41,11 @@</span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"></span>
<span style="color: #A00000">-@@ -57,11 +57,11 @@</span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"></span>
<span style="color: #A00000">-@@ -77,9 +77,11 @@</span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-@@ -92,10 +94,12 @@</span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-@@ -110,18 +114,6 @@</span>
<span style="color: #A00000">- <PropertyGroup Label="UserMacros" /></span>
<span style="color: #A00000">- <PropertyGroup></span>
<span style="color: #A00000">- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">false</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">false</LinkIncremental></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></span>
<span style="color: #A00000">- <Midl></span>
<span style="color: #A00000">-@@ -231,45 +223,23 @@</span>
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>Disabled</Optimization></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #A00000">- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">- <ResourceCompile></span>
<span style="color: #A00000">- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'"></span>
<span style="color: #A00000">-@@ -278,45 +248,23 @@</span>
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>Disabled</Optimization></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #A00000">- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">- <ResourceCompile></span>
<span style="color: #A00000">- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x64.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)/portaudio_x64.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'"></span>
<span style="color: #A00000">-@@ -325,22 +273,15 @@</span>
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>MaxSpeed</Optimization></span>
<span style="color: #A00000">-- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #A00000">-+ <InlineFunctionExpansion>Default</InlineFunctionExpansion></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <StringPooling>true</StringPooling></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #A00000">- <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">-@@ -348,20 +289,8 @@</span>
<span style="color: #A00000">- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'"></span>
<span style="color: #A00000">-@@ -370,22 +299,15 @@</span>
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>MaxSpeed</Optimization></span>
<span style="color: #A00000">-- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #A00000">-- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <InlineFunctionExpansion>Default</InlineFunctionExpansion></span>
<span style="color: #A00000">-+ <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <StringPooling>true</StringPooling></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #A00000">- <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">-@@ -393,20 +315,8 @@</span>
<span style="color: #A00000">- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)/portaudio_x64.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemGroup></span>
<span style="color: #A00000">-@@ -594,6 +504,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -605,6 +516,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -618,6 +530,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -629,6 +542,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -642,6 +556,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -653,6 +568,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -666,6 +582,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -677,6 +594,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -690,6 +608,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -701,6 +620,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -714,6 +634,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -725,6 +646,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -738,6 +660,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -749,6 +672,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -762,6 +686,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">-@@ -773,6 +698,7 @@</span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/FSClient.sln b/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #000080; font-weight: bold">index 12ca810..f4512a5 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #800080; font-weight: bold">@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Items", "External</span>
ProjectSection(SolutionItems) = preProject
External Items\JabraTelephonyAPI.dll = External Items\JabraTelephonyAPI.dll
External Items\Plantronics.Device.Common.dll = External Items\Plantronics.Device.Common.dll
<span style="color: #A00000">- External Items\portaudio_dx_win.patch = External Items\portaudio_dx_win.patch</span>
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conf", "conf", "{BDB28E84-D1D5-4102-BD29-C638197EFD42}"
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Seems x64 builds were not excluding things properly
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/External Items/portaudio_dx_win.patch b/mitchcapper/FSClient/External Items/portaudio_dx_win.patch</span>
<span style="color: #000080; font-weight: bold">index 12df16e..21c1caf 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/External Items/portaudio_dx_win.patch </span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/External Items/portaudio_dx_win.patch </span>
<span style="color: #800080; font-weight: bold">@@ -3,294 +3,424 @@ index edee701..464cb2e 100644</span>
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -1569,18 +1569,18 @@ Global
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.Build.0 = Release DirectSound|x64</span>
<span style="color: #A00000">- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x86 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release|x64</span>
<span style="color: #A00000">-- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release DirectSound|Win32</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #A00000">-+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64</span>
<span style="color: #A00000">- {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64</span>
<span style="color: #00A000">+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #00A000">+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64 Setup.Build.0 = Release DirectSound|x64</span>
<span style="color: #00A000">+ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x86 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug|Win32</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release|x64</span>
<span style="color: #00A000">+- {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug DirectSound|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64 Setup.ActiveCfg = Debug DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86 Setup.ActiveCfg = Debug DirectSound|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release DirectSound|Win32</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64 Setup.ActiveCfg = Release DirectSound|x64</span>
<span style="color: #00A000">++ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86 Setup.ActiveCfg = Release DirectSound|Win32</span>
<span style="color: #00A000">+ {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64</span>
<span style="color: #00A000">+ {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64</span>
<span style="color: #00A000">+ {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64</span>
diff --git a/libs/portaudio/build/msvc/portaudio.2010.vcxproj b/libs/portaudio/build/msvc/portaudio.2010.vcxproj
<span style="color: #A00000">-index b4eca56..cfc35c5 100644</span>
<span style="color: #00A000">+index b4eca56..10b4c25 100644</span>
--- a/libs/portaudio/build/msvc/portaudio.2010.vcxproj
+++ b/libs/portaudio/build/msvc/portaudio.2010.vcxproj
@@ -41,11 +41,11 @@
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #00A000">+- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #00A000">++ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #00A000">+ <UseOfMfc>false</UseOfMfc></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration"></span>
<span style="color: #00A000">+- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #00A000">++ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #00A000">+ <UseOfMfc>false</UseOfMfc></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"></span>
@@ -57,11 +57,11 @@
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration"></span>
<span style="color: #A00000">-- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #A00000">-+ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #A00000">- <UseOfMfc>false</UseOfMfc></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"></span>
<span style="color: #00A000">+ <UseOfMfc>false</UseOfMfc></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration"></span>
<span style="color: #00A000">+- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #00A000">++ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #00A000">+ <UseOfMfc>false</UseOfMfc></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration"></span>
<span style="color: #00A000">+- <ConfigurationType>DynamicLibrary</ConfigurationType></span>
<span style="color: #00A000">++ <ConfigurationType>StaticLibrary</ConfigurationType></span>
<span style="color: #00A000">+ <UseOfMfc>false</UseOfMfc></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"></span>
@@ -77,9 +77,11 @@
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">+ </ImportGroup></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">++ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #00A000">+ </ImportGroup></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">++ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #00A000">+ </ImportGroup></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
@@ -92,10 +94,12 @@
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #A00000">- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #A00000">-+ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #A00000">- </ImportGroup></span>
<span style="color: #A00000">- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"></span>
<span style="color: #A00000">- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #00A000">++ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #00A000">+ </ImportGroup></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
<span style="color: #00A000">+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /></span>
<span style="color: #00A000">++ <Import Project="..\..\..\..\w32\extlib.props" /></span>
<span style="color: #00A000">+ </ImportGroup></span>
<span style="color: #00A000">+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"></span>
<span style="color: #00A000">+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /></span>
@@ -110,18 +114,6 @@
<span style="color: #A00000">- <PropertyGroup Label="UserMacros" /></span>
<span style="color: #A00000">- <PropertyGroup></span>
<span style="color: #A00000">- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">false</LinkIncremental></span>
<span style="color: #A00000">-- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #A00000">-- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #A00000">-- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">false</LinkIncremental></span>
<span style="color: #A00000">- </PropertyGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></span>
<span style="color: #A00000">- <Midl></span>
<span style="color: #00A000">+ <PropertyGroup Label="UserMacros" /></span>
<span style="color: #00A000">+ <PropertyGroup></span>
<span style="color: #00A000">+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion></span>
<span style="color: #00A000">+- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #00A000">+- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #00A000">+- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</LinkIncremental></span>
<span style="color: #00A000">+- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #00A000">+- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #00A000">+- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</LinkIncremental></span>
<span style="color: #00A000">+- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</OutDir></span>
<span style="color: #00A000">+- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">$(Configuration)\</IntDir></span>
<span style="color: #00A000">+- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">false</LinkIncremental></span>
<span style="color: #00A000">+- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</OutDir></span>
<span style="color: #00A000">+- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">$(Platform)\$(Configuration)\</IntDir></span>
<span style="color: #00A000">+- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">false</LinkIncremental></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></span>
<span style="color: #00A000">+ <Midl></span>
@@ -231,45 +223,23 @@
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>Disabled</Optimization></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #A00000">- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">- <ResourceCompile></span>
<span style="color: #A00000">- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'"></span>
<span style="color: #00A000">+ <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #00A000">+- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #00A000">+- <HeaderFileName></span>
<span style="color: #00A000">+- </HeaderFileName></span>
<span style="color: #00A000">+ </Midl></span>
<span style="color: #00A000">+ <ClCompile></span>
<span style="color: #00A000">+ <Optimization>Disabled</Optimization></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #00A000">+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #00A000">+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #00A000">+- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #00A000">+- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #00A000">+- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #00A000">+- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #00A000">+ <WarningLevel>Level3</WarningLevel></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #00A000">+ </ClCompile></span>
<span style="color: #00A000">+ <ResourceCompile></span>
<span style="color: #00A000">+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <Culture>0x0409</Culture></span>
<span style="color: #00A000">+ </ResourceCompile></span>
<span style="color: #00A000">+- <Link></span>
<span style="color: #00A000">+- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #00A000">+- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #00A000">+- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #00A000">+- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #00A000">+- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #00A000">+- <DataExecutionPrevention></span>
<span style="color: #00A000">+- </DataExecutionPrevention></span>
<span style="color: #00A000">+- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #00A000">+- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #00A000">+- </Link></span>
<span style="color: #00A000">+ <Bscmake></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #00A000">+ </Bscmake></span>
<span style="color: #00A000">+ </ItemDefinitionGroup></span>
<span style="color: #00A000">+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'"></span>
@@ -278,45 +248,23 @@
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>Disabled</Optimization></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #A00000">- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #A00000">- <ResourceCompile></span>
<span style="color: #A00000">- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x64.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)/portaudio_x64.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'"></span>
<span style="color: #00A000">+ <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #00A000">+- <TypeLibraryName>.\Debug_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #00A000">+- <HeaderFileName></span>
<span style="color: #00A000">+- </HeaderFileName></span>
<span style="color: #00A000">+ </Midl></span>
<span style="color: #00A000">+ <ClCompile></span>
<span style="color: #00A000">+ <Optimization>Disabled</Optimization></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+- <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <MinimalRebuild>true</MinimalRebuild></span>
<span style="color: #00A000">+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks></span>
<span style="color: #00A000">+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary></span>
<span style="color: #00A000">+- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #00A000">+- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #00A000">+- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #00A000">+- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #00A000">+ <WarningLevel>Level3</WarningLevel></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat></span>
<span style="color: #00A000">+ </ClCompile></span>
<span style="color: #00A000">+ <ResourceCompile></span>
<span style="color: #00A000">+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <Culture>0x0409</Culture></span>
<span style="color: #00A000">+ </ResourceCompile></span>
<span style="color: #00A000">+- <Link></span>
<span style="color: #00A000">+- <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #00A000">+- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #00A000">+- <GenerateDebugInformation>true</GenerateDebugInformation></span>
<span style="color: #00A000">+- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #00A000">+- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #00A000">+- <DataExecutionPrevention></span>
<span style="color: #00A000">+- </DataExecutionPrevention></span>
<span style="color: #00A000">+- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x64.lib</ImportLibrary></span>
<span style="color: #00A000">+- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #00A000">+- </Link></span>
<span style="color: #00A000">+ <Bscmake></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)/portaudio_x64.bsc</OutputFile></span>
<span style="color: #00A000">+ </Bscmake></span>
<span style="color: #00A000">+ </ItemDefinitionGroup></span>
<span style="color: #00A000">+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'"></span>
@@ -325,22 +273,15 @@
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>MaxSpeed</Optimization></span>
<span style="color: #A00000">-- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #A00000">-+ <InlineFunctionExpansion>Default</InlineFunctionExpansion></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <StringPooling>true</StringPooling></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #A00000">- <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #00A000">+ <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ <TargetEnvironment>Win32</TargetEnvironment></span>
<span style="color: #00A000">+- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #00A000">+- <HeaderFileName></span>
<span style="color: #00A000">+- </HeaderFileName></span>
<span style="color: #00A000">+ </Midl></span>
<span style="color: #00A000">+ <ClCompile></span>
<span style="color: #00A000">+ <Optimization>MaxSpeed</Optimization></span>
<span style="color: #00A000">+- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #00A000">++ <InlineFunctionExpansion>Default</InlineFunctionExpansion></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <StringPooling>true</StringPooling></span>
<span style="color: #00A000">+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #00A000">+ <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #00A000">+- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #00A000">+- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #00A000">+- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #00A000">+- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #00A000">+ <WarningLevel>Level3</WarningLevel></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ </ClCompile></span>
@@ -348,20 +289,8 @@
<span style="color: #A00000">- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'"></span>
<span style="color: #00A000">+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <Culture>0x0409</Culture></span>
<span style="color: #00A000">+ </ResourceCompile></span>
<span style="color: #00A000">+- <Link></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile></span>
<span style="color: #00A000">+- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #00A000">+- <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile></span>
<span style="color: #00A000">+- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #00A000">+- <DataExecutionPrevention></span>
<span style="color: #00A000">+- </DataExecutionPrevention></span>
<span style="color: #00A000">+- <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary></span>
<span style="color: #00A000">+- <TargetMachine>MachineX86</TargetMachine></span>
<span style="color: #00A000">+- </Link></span>
<span style="color: #00A000">+ <Bscmake></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile></span>
<span style="color: #00A000">+ </Bscmake></span>
<span style="color: #00A000">+ </ItemDefinitionGroup></span>
<span style="color: #00A000">+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'"></span>
@@ -370,22 +299,15 @@
<span style="color: #A00000">- <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #A00000">-- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #A00000">-- <HeaderFileName></span>
<span style="color: #A00000">-- </HeaderFileName></span>
<span style="color: #A00000">- </Midl></span>
<span style="color: #A00000">- <ClCompile></span>
<span style="color: #A00000">- <Optimization>MaxSpeed</Optimization></span>
<span style="color: #A00000">- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #A00000">- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #A00000">-- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">-+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <StringPooling>true</StringPooling></span>
<span style="color: #A00000">- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #A00000">- <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #A00000">-- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #A00000">-- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #A00000">-- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #A00000">-- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #A00000">- <WarningLevel>Level3</WarningLevel></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">- </ClCompile></span>
<span style="color: #00A000">+ <MkTypLibCompatible>true</MkTypLibCompatible></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ <TargetEnvironment>X64</TargetEnvironment></span>
<span style="color: #00A000">+- <TypeLibraryName>.\Release_x86/portaudio.tlb</TypeLibraryName></span>
<span style="color: #00A000">+- <HeaderFileName></span>
<span style="color: #00A000">+- </HeaderFileName></span>
<span style="color: #00A000">+ </Midl></span>
<span style="color: #00A000">+ <ClCompile></span>
<span style="color: #00A000">+ <Optimization>MaxSpeed</Optimization></span>
<span style="color: #00A000">+- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion></span>
<span style="color: #00A000">+- <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+- <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <InlineFunctionExpansion>Default</InlineFunctionExpansion></span>
<span style="color: #00A000">++ <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">++ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <StringPooling>true</StringPooling></span>
<span style="color: #00A000">+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary></span>
<span style="color: #00A000">+ <FunctionLevelLinking>true</FunctionLevelLinking></span>
<span style="color: #00A000">+- <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile></span>
<span style="color: #00A000">+- <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation></span>
<span style="color: #00A000">+- <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName></span>
<span style="color: #00A000">+- <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName></span>
<span style="color: #00A000">+ <WarningLevel>Level3</WarningLevel></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+ </ClCompile></span>
@@ -393,20 +315,8 @@
<span style="color: #A00000">- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #A00000">- <Culture>0x0409</Culture></span>
<span style="color: #A00000">- </ResourceCompile></span>
<span style="color: #A00000">-- <Link></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #A00000">-- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #A00000">-- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #A00000">-- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #A00000">-- <DataExecutionPrevention></span>
<span style="color: #A00000">-- </DataExecutionPrevention></span>
<span style="color: #A00000">-- <ImportLibrary>$(Platform)\$(Configuration)/portaudio_x64.lib</ImportLibrary></span>
<span style="color: #A00000">-- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #A00000">-- </Link></span>
<span style="color: #A00000">- <Bscmake></span>
<span style="color: #A00000">- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #A00000">-- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.bsc</OutputFile></span>
<span style="color: #A00000">- </Bscmake></span>
<span style="color: #A00000">- </ItemDefinitionGroup></span>
<span style="color: #A00000">- <ItemGroup></span>
<span style="color: #00A000">+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <Culture>0x0409</Culture></span>
<span style="color: #00A000">+ </ResourceCompile></span>
<span style="color: #00A000">+- <Link></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.dll</OutputFile></span>
<span style="color: #00A000">+- <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile></span>
<span style="color: #00A000">+- <ProgramDatabaseFile>$(Platform)\$(Configuration)/portaudio_x64.pdb</ProgramDatabaseFile></span>
<span style="color: #00A000">+- <RandomizedBaseAddress>false</RandomizedBaseAddress></span>
<span style="color: #00A000">+- <DataExecutionPrevention></span>
<span style="color: #00A000">+- </DataExecutionPrevention></span>
<span style="color: #00A000">+- <ImportLibrary>$(Platform)\$(Configuration)/portaudio_x64.lib</ImportLibrary></span>
<span style="color: #00A000">+- <TargetMachine>MachineX64</TargetMachine></span>
<span style="color: #00A000">+- </Link></span>
<span style="color: #00A000">+ <Bscmake></span>
<span style="color: #00A000">+ <SuppressStartupBanner>true</SuppressStartupBanner></span>
<span style="color: #00A000">+- <OutputFile>$(Platform)\$(Configuration)\portaudio_x64.bsc</OutputFile></span>
<span style="color: #00A000">+ </Bscmake></span>
<span style="color: #00A000">+ </ItemDefinitionGroup></span>
<span style="color: #00A000">+ <ItemGroup></span>
<span style="color: #00A000">+@@ -594,6 +504,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -605,6 +516,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -618,6 +530,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -629,6 +542,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -642,6 +556,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -653,6 +568,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -666,6 +582,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -677,6 +594,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -690,6 +608,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -701,6 +620,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -714,6 +634,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -725,6 +646,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -738,6 +660,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -749,6 +672,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -762,6 +686,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+@@ -773,6 +698,7 @@</span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">++ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild></span>
<span style="color: #00A000">+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories></span>
<span style="color: #00A000">+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions></span>
<span style="color: #00A000">+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild></span>
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025 - this should be the last commit on this bug id
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
deleted file mode 100644
<span style="color: #000080; font-weight: bold">index f611376..0000000</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ /dev/null</span>
<span style="color: #800080; font-weight: bold">@@ -1,8 +0,0 @@</span>
<span style="color: #A00000">-blaaaaaah</span>
<span style="color: #A00000">-blaaaaaah</span>
<span style="color: #A00000">-blaaaaaah</span>
<span style="color: #A00000">-blaaaaaah</span>
<span style="color: #A00000">-blaaaaaah</span>
<span style="color: #A00000">-testing</span>
<span style="color: #A00000">-testing</span>
<span style="color: #A00000">-WT</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index bd6e5e0..f611376 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -5,3 +5,4 @@ blaaaaaah</span>
blaaaaaah
testing
testing
<span style="color: #00A000">+WT</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index 201120d..bd6e5e0 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -4,3 +4,4 @@ blaaaaaah</span>
blaaaaaah
blaaaaaah
testing
<span style="color: #00A000">+testing</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index 3fdc27e..201120d 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -3,3 +3,4 @@ blaaaaaah</span>
blaaaaaah
blaaaaaah
blaaaaaah
<span style="color: #00A000">+testing</span>
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
merged setup changes
<span style="color: #000080; font-weight: bold">diff --cc mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #000080; font-weight: bold">index 4cbf2a3,0ab94b7..bb93a12</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #800080; font-weight: bold">@@@ -11,10 -11,9 +11,10 @@@</span>
<?endif ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
- <Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
+ <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.0.1.0" Manufacturer="FreeSWITCH" UpgradeCode="7668FAEF-2AB3-4079-A986-07A33739B42E">
<span style="color: #A00000">- <Package InstallerVersion="200" Compressed="yes" /></span>
<span style="color: #00A000">+ <Package InstallerVersion="300" Compressed="yes" /></span>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
<span style="color: #800080; font-weight: bold">@@@ -28,85 -27,64 +28,85 @@@</span>
<Directory Id="INSTALLLOCATION" Name="FSClient">
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
<!-- <Component Id="ProductComponent" Guid="594203af-235a-4a7d-aff8-045997f872ec"> -->
<span style="color: #A00000">- <!-- TODO: Insert files, registry keys, and other resources here. --></span>
<span style="color: #00A000">+ <!-- TODO: Insert files, registry keys, and other resources here. --></span>
<!-- </Component> -->
<span style="color: #A00000">- <Directory Id="MODLOCATION" Name="Mod"></span>
<span style="color: #A00000">- </Directory></span>
<span style="color: #A00000">- <Directory Id="CONFLOCATION" Name="Conf"></span>
<span style="color: #A00000">- </Directory></span>
<span style="color: #A00000">- <Directory Id="PLUGINLOCATION" Name="Plugins"></span>
<span style="color: #A00000">- </Directory></span>
<span style="color: #00A000">+ <Directory Id="MODLOCATION" Name="Mod"></span>
<span style="color: #00A000">+ </Directory></span>
<span style="color: #00A000">+ <Directory Id="CONFLOCATION" Name="Conf"></span>
<span style="color: #00A000">+ </Directory></span>
<span style="color: #00A000">+ <Directory Id="PLUGINLOCATION" Name="Plugins"></span>
<span style="color: #00A000">+ </Directory></span>
</Directory>
</Directory>
<span style="color: #A00000">- <?if $(var.Platform) != x64 ?></span>
<span style="color: #A00000">- <Merge Id="CrtFiles_x86"</span>
<span style="color: #A00000">- SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"</span>
<span style="color: #A00000">- DiskId="1"</span>
<span style="color: #A00000">- Language="1033"/></span>
<span style="color: #A00000">- <?endif ?></span>
<span style="color: #A00000">- <?if $(var.Platform) = x64 ?></span>
<span style="color: #A00000">- <Merge Id="CrtFiles_x64"</span>
<span style="color: #A00000">- SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"</span>
<span style="color: #A00000">- DiskId="1"</span>
<span style="color: #A00000">- Language="1033"/></span>
<span style="color: #A00000">- <?endif ?></span>
<span style="color: #A00000">- <Directory Id="ProgramMenuFolder"></span>
<span style="color: #A00000">- <Directory Id="ApplicationProgramsFolder" Name="FSClient"/></span>
<span style="color: #A00000">- </Directory></span>
<span style="color: #00A000">+ <?if $(var.Platform) != x64 ?></span>
<span style="color: #00A000">+ <Merge Id="CrtFiles_x86"</span>
<span style="color: #00A000">+ SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"</span>
<span style="color: #00A000">+ DiskId="1"</span>
<span style="color: #00A000">+ Language="1033"/></span>
<span style="color: #00A000">+ <?endif ?></span>
<span style="color: #00A000">+ <?if $(var.Platform) = x64 ?></span>
<span style="color: #00A000">+ <Merge Id="CrtFiles_x64"</span>
<span style="color: #00A000">+ SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"</span>
<span style="color: #00A000">+ DiskId="1"</span>
<span style="color: #00A000">+ Language="1033"/></span>
<span style="color: #00A000">+ <?endif ?></span>
<span style="color: #00A000">+ <Directory Id="ProgramMenuFolder"></span>
<span style="color: #00A000">+ <Directory Id="ApplicationProgramsFolder" Name="FSClient"/></span>
<span style="color: #00A000">+ </Directory></span>
</Directory>
<span style="color: #A00000">- <DirectoryRef Id="ApplicationProgramsFolder"></span>
<span style="color: #A00000">- <Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C"></span>
<span style="color: #A00000">- <Shortcut Id="ApplicationStartMenuShortcut"</span>
<span style="color: #A00000">- Name="FSClient"</span>
<span style="color: #A00000">- Description="FreeSWITCH Windows Phone"</span>
<span style="color: #A00000">- Target="[INSTALLLOCATION]FSClient.exe"</span>
<span style="color: #A00000">- WorkingDirectory="INSTALLLOCATION"/></span>
<span style="color: #00A000">+ <DirectoryRef Id="ApplicationProgramsFolder"></span>
<span style="color: #00A000">+ <Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C"></span>
<span style="color: #00A000">+ <Shortcut Id="ApplicationStartMenuShortcut"</span>
<span style="color: #00A000">+ Name="FSClient"</span>
<span style="color: #00A000">+ Description="FreeSWITCH Windows Phone"</span>
<span style="color: #00A000">+ Target="[INSTALLLOCATION]FSClient.exe"</span>
<span style="color: #00A000">+ WorkingDirectory="INSTALLLOCATION"/></span>
+ <util:InternetShortcut Id="OnlineDocumentationShortcut"
+ Name="Online Documentation"
+ Target="http://wiki.freeswitch.com/wiki/FSClient"/>
+ <Shortcut Id="UninstallProduct"
+ Name="Uninstall FSClient"
+ Target="[SystemFolder]msiexec.exe"
+ Arguments="/x [ProductCode]"
+ Description="Uninstalls FSClient" />
+
<span style="color: #A00000">- <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/></span>
<span style="color: #A00000">- <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/></span>
<span style="color: #A00000">- </Component></span>
<span style="color: #A00000">- </DirectoryRef></span>
<span style="color: #00A000">+ <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/></span>
<span style="color: #00A000">+ <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/></span>
<span style="color: #00A000">+ </Component></span>
<span style="color: #00A000">+ </DirectoryRef></span>
<Feature Id="ProductFeature" Title="FSClient Core" Level="1">
<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
<span style="color: #A00000">- <!-- <ComponentRef Id="ProductComponent" /> --></span>
<span style="color: #A00000">- <ComponentGroupRef Id="FSCoreComp"/></span>
<span style="color: #A00000">- <ComponentGroupRef Id="FSCoreModComp"/></span>
<span style="color: #A00000">- <ComponentRef Id="FSCoreConfComp"/></span>
<span style="color: #A00000">- <ComponentGroupRef Id="FSClientComp"/></span>
<span style="color: #A00000">- <ComponentRef Id="ApplicationShortcut" /></span>
<span style="color: #A00000">- </span>
<span style="color: #00A000">+ <!-- <ComponentRef Id="ProductComponent" /> --></span>
<span style="color: #00A000">+ <ComponentGroupRef Id="FSCoreComp"/></span>
<span style="color: #00A000">+ <ComponentGroupRef Id="FSCoreModComp"/></span>
<span style="color: #00A000">+ <ComponentRef Id="FSCoreConfComp"/></span>
<span style="color: #00A000">+ <ComponentGroupRef Id="FSClientComp"/></span>
<span style="color: #00A000">+ <ComponentRef Id="ApplicationShortcut" /></span>
<span style="color: #00A000">+ </span>
<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
<ComponentGroupRef Id="Product.Generated" />
<span style="color: #A00000">- <?if $(var.Platform) != x64 ?></span>
<span style="color: #A00000">- <MergeRef Id="CrtFiles_x86"/></span>
<span style="color: #A00000">- <?endif ?></span>
<span style="color: #A00000">- <?if $(var.Platform) = x64 ?></span>
<span style="color: #A00000">- <MergeRef Id="CrtFiles_x64"/></span>
<span style="color: #A00000">- <?endif ?></span>
<span style="color: #00A000">+ <?if $(var.Platform) != x64 ?></span>
<span style="color: #00A000">+ <MergeRef Id="CrtFiles_x86"/></span>
<span style="color: #00A000">+ <?endif ?></span>
<span style="color: #00A000">+ <?if $(var.Platform) = x64 ?></span>
<span style="color: #00A000">+ <MergeRef Id="CrtFiles_x64"/></span>
<span style="color: #00A000">+ <?endif ?></span>
</Feature>
<span style="color: #A00000">- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /></span>
<span style="color: #A00000">- <UIRef Id="WixUI_InstallDir" /></span>
<span style="color: #00A000">+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /></span>
<span style="color: #00A000">+ <UIRef Id="WixUI_InstallDir" /></span>
+ <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch FSClient" />
+ <Property Id="WixShellExecTarget" Value="[INSTALLLOCATION]FSClient.exe" />
+ <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
+ <UI>
+ <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+ </UI>
+ <WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
+ <Icon Id="icon.ico" SourceFile="../phone.ico"/>
+ <Property Id="ARPPRODUCTICON" Value="icon.ico" />
+ <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes" />
+
<span style="color: #A00000">- </Product></span>
<span style="color: #00A000">+ </Product></span>
</Wix>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index 41f89d6..3fdc27e 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -2,3 +2,4 @@ blaaaaaah</span>
blaaaaaah
blaaaaaah
blaaaaaah
<span style="color: #00A000">+blaaaaaah</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
test
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index a6d581e..41f89d6 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -1,3 +1,4 @@</span>
blaaaaaah
blaaaaaah
blaaaaaah
<span style="color: #00A000">+blaaaaaah</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
test
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index 56ec127..a6d581e 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -1,2 +1,3 @@</span>
blaaaaaah
blaaaaaah
<span style="color: #00A000">+blaaaaaah</span>
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
test
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..56ec127</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,2 @@</span>
<span style="color: #00A000">+blaaaaaah</span>
<span style="color: #00A000">+blaaaaaah</span>
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
change version of installer required
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/Product.wxs b/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #000080; font-weight: bold">index 073c9f0..0ab94b7 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -13,7 +13,7 @@</span>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
<span style="color: #A00000">- <Package InstallerVersion="200" Compressed="yes" /></span>
<span style="color: #00A000">+ <Package InstallerVersion="300" Compressed="yes" /></span>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Make accounts default to 0 last rather than after 1, add a proper remove account function and kill it out of sofia first, don't add a new account if a user clicks cancel.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Account.cs b/mitchcapper/FSClient/Account.cs</span>
<span style="color: #000080; font-weight: bold">index d987ced..59f0197 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Account.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Account.cs</span>
<span style="color: #800080; font-weight: bold">@@ -125,7 +125,11 @@ namespace FSClient {</span>
account.guid = "";
account.guid = old_guid;
}
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ public static void RemoveAccount(Account account){</span>
<span style="color: #00A000">+ account.KillGateway();</span>
<span style="color: #00A000">+ accounts.Remove(account);</span>
<span style="color: #00A000">+ ReloadSofia();</span>
<span style="color: #00A000">+ }</span>
public static void create_gateway_nodes(XmlNode gateways_node) {
foreach (Account account in accounts) {
<span style="color: #800080; font-weight: bold">@@ -170,9 +174,10 @@ namespace FSClient {</span>
_guid.PropertyChanged += (s, e) => {
if (!guid_ok(this, _guid.value) || String.IsNullOrEmpty(_guid.value)) {
<span style="color: #A00000">- for (int i = 0; i < 10; i++) {</span>
<span style="color: #A00000">- if (guid_ok(this, i.ToString())) {</span>
<span style="color: #A00000">- _guid.value = i.ToString();</span>
<span style="color: #00A000">+ for (int i = 1; i <= 10; i++){</span>
<span style="color: #00A000">+ int val = i == 10 ? 0 : i; // want 0 checked last.</span>
<span style="color: #00A000">+ if (guid_ok(this, val.ToString())) {</span>
<span style="color: #00A000">+ _guid.value = val.ToString();</span>
return;
}
}
<span style="color: #800080; font-weight: bold">@@ -329,13 +334,16 @@ namespace FSClient {</span>
KillGateway();
ReloadSofia();
}
<span style="color: #A00000">- public void edit() {</span>
<span style="color: #00A000">+ public bool edit() {</span>
current_editing_account = this;
GenericEditor editor = new GenericEditor();
editor.Init("Editing Account", values);
editor.ShowDialog();
if (editor.DialogResult == true)
ReloadAccount();
<span style="color: #00A000">+ else</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ return true;</span>
}
}
}
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index b774695..58d6d91 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -228,7 +228,7 @@ namespace FSClient {</span>
}
public void DialString(String str){
if (string.IsNullOrWhiteSpace(str))
<span style="color: #A00000">- return;</span>
<span style="color: #00A000">+ return;</span>
MainWindowRemoveFocus(true);
if (str.StartsWith("#") && str.Length > 2) {
<span style="color: #800080; font-weight: bold">@@ -572,8 +572,8 @@ namespace FSClient {</span>
public OurAutoCompleteBox GetContactSearchBox() {
return MainWindow.get_instance().GetContactSearchBox();
}
<span style="color: #A00000">- public void MainWindowRemoveFocus(bool ResetContactSearchText=false){</span>
<span style="color: #A00000">- MainWindow.get_instance().RemoveFocus(ResetContactSearchText);</span>
<span style="color: #00A000">+ public void MainWindowRemoveFocus(bool ResetContactSearchText=false){</span>
<span style="color: #00A000">+ MainWindow.get_instance().RemoveFocus(ResetContactSearchText);</span>
}
private delegate void BroadcastEventDel(FSEvent evt);
BroadcastEventDel BroadcastHandler;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #000080; font-weight: bold">index 2201cf0..1ea68a4 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #800080; font-weight: bold">@@ -365,7 +365,8 @@ namespace FSClient {</span>
private void AccountNew_Click(object sender, RoutedEventArgs e) {
Account acct = new Account();
Account.AddAccount(acct);
<span style="color: #A00000">- acct.edit();</span>
<span style="color: #00A000">+ if (!acct.edit())</span>
<span style="color: #00A000">+ Account.RemoveAccount(acct);</span>
}
<span style="color: #800080; font-weight: bold">@@ -387,7 +388,7 @@ namespace FSClient {</span>
Account acct = gridAccounts.SelectedItem as Account;
if (acct == null)
return;
<span style="color: #A00000">- Account.accounts.Remove(acct);</span>
<span style="color: #00A000">+ Account.RemoveAccount(acct);</span>
}
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
I cannot spell the word balloons.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index 0195525..b774695 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -46,7 +46,7 @@ namespace FSClient {</span>
Account.LoadSettings();
<span style="color: #A00000">- IncomingBallons = Properties.Settings.Default.IncomingBallons;</span>
<span style="color: #00A000">+ IncomingBalloons = Properties.Settings.Default.IncomingBalloons;</span>
IncomingTopMost = Properties.Settings.Default.FrontOnIncoming;
ClearDTMFS = Properties.Settings.Default.ClearDTMFS;
UseNumberOnlyInput = Properties.Settings.Default.UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -306,7 +306,7 @@ namespace FSClient {</span>
try {
SaveAudioSettings();
Account.SaveSettings();
<span style="color: #A00000">- Properties.Settings.Default.IncomingBallons = IncomingBallons;</span>
<span style="color: #00A000">+ Properties.Settings.Default.IncomingBalloons = IncomingBalloons;</span>
Properties.Settings.Default.FrontOnIncoming = IncomingTopMost;
Properties.Settings.Default.ClearDTMFS = ClearDTMFS;
Properties.Settings.Default.UseNumberOnlyInput = UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -389,7 +389,7 @@ namespace FSClient {</span>
if (IncomingTopMost) {
MainWindow.get_instance().BringToFront();
}
<span style="color: #A00000">- if (IncomingBallons && !DND) {</span>
<span style="color: #00A000">+ if (IncomingBalloons && !DND) {</span>
IncomingCallNotification.ShowCallNotification(args.call);
if (Call.active_call != args.call && Call.active_call != null)
HandleCallWaiting(null, args.call);
<span style="color: #800080; font-weight: bold">@@ -404,7 +404,7 @@ namespace FSClient {</span>
}
#region properties
<span style="color: #A00000">- public bool IncomingBallons;</span>
<span style="color: #00A000">+ public bool IncomingBalloons;</span>
public bool IncomingTopMost;
public bool UseNumberOnlyInput {
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Options.xaml b/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #000080; font-weight: bold">index 992af17..7fc4ba9 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #800080; font-weight: bold">@@ -45,7 +45,7 @@</span>
<ComboBox Height="23" Grid.Row="6" Grid.Column="1" Name="comboRingDevice" Width="340" />
<StackPanel Grid.Row="7" Grid.Column="1" Grid.RowSpan="3">
<CheckBox x:Name="chkIncomingFront" Content="Bring To Front On Incoming Calls" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<span style="color: #A00000">- <CheckBox x:Name="chkIncomingBallons" Content="Show Incoming Call Notification Ballons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" /></span>
<span style="color: #00A000">+ <CheckBox x:Name="chkIncomingBalloons" Content="Show Incoming Call Notification Balloons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" /></span>
<CheckBox x:Name="chkClearDTMFS" Content="Clear Key Presses In Call Stats On Disconnect" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkUseNumbers" Content="Only Allow Numerical Input While Dialing" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
</StackPanel>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Options.xaml.cs b/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #000080; font-weight: bold">index 11fcd70..fb7c1f3 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #800080; font-weight: bold">@@ -31,7 +31,7 @@ namespace FSClient {</span>
comboSpeakerInput.SelectedItem = broker.SpeakerInDev;
comboSpeakerOutput.SelectedItem = broker.SpeakerOutDev;
comboRingDevice.SelectedItem = broker.RingDev;
<span style="color: #A00000">- chkIncomingBallons.IsChecked = broker.IncomingBallons;</span>
<span style="color: #00A000">+ chkIncomingBalloons.IsChecked = broker.IncomingBalloons;</span>
chkIncomingFront.IsChecked = broker.IncomingTopMost;
chkClearDTMFS.IsChecked = broker.ClearDTMFS;
chkUseNumbers.IsChecked = broker.UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -51,7 +51,7 @@ namespace FSClient {</span>
broker.SetSpeakerDevs(indev == null ? "" : indev.name, outdev == null ? "" : outdev.name);
outdev = comboRingDevice.SelectedItem as PortAudio.AudioDevice;
broker.SetRingDev(outdev == null ? "" : outdev.name);
<span style="color: #A00000">- broker.IncomingBallons = chkIncomingBallons.IsChecked == true;</span>
<span style="color: #00A000">+ broker.IncomingBalloons = chkIncomingBalloons.IsChecked == true;</span>
broker.IncomingTopMost = chkIncomingFront.IsChecked == true;
broker.ClearDTMFS = chkClearDTMFS.IsChecked == true;
broker.UseNumberOnlyInput = chkUseNumbers.IsChecked == true;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Properties/Settings.Designer.cs b/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #000080; font-weight: bold">index fa47b05..84e25f5 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #800080; font-weight: bold">@@ -120,12 +120,12 @@ namespace FSClient.Properties {</span>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
<span style="color: #A00000">- public bool IncomingBallons {</span>
<span style="color: #00A000">+ public bool IncomingBalloons {</span>
get {
<span style="color: #A00000">- return ((bool)(this["IncomingBallons"]));</span>
<span style="color: #00A000">+ return ((bool)(this["IncomingBalloons"]));</span>
}
set {
<span style="color: #A00000">- this["IncomingBallons"] = value;</span>
<span style="color: #00A000">+ this["IncomingBalloons"] = value;</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Properties/Settings.settings b/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #000080; font-weight: bold">index e74d6ce..74ba8e9 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #800080; font-weight: bold">@@ -26,7 +26,7 @@</span>
<Setting Name="FrontOnIncoming" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<span style="color: #A00000">- <Setting Name="IncomingBallons" Type="System.Boolean" Scope="User"></span>
<span style="color: #00A000">+ <Setting Name="IncomingBalloons" Type="System.Boolean" Scope="User"></span>
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="HeadsetDevice" Type="System.String" Scope="User">
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #000080; font-weight: bold">index 4575f30..3c1b33b 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #800080; font-weight: bold">@@ -127,8 +127,8 @@ namespace FSClient</span>
}
protected void refresh_search_box(){
if (search_box == null)
<span style="color: #A00000">- return;</span>
<span style="color: #A00000">- search_box.ItemsSource = from c in number_to_alias select new SearchAutoCompleteEntry(c.Key,c.Value);</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ search_box.ItemsSource = from c in number_to_alias orderby c.Value,c.Key select new SearchAutoCompleteEntry(c.Key, c.Value);</span>
}
protected class SearchAutoCompleteEntry{
public string number;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/app.config b/mitchcapper/FSClient/app.config</span>
<span style="color: #000080; font-weight: bold">index 27ee233..292f672 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/app.config</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/app.config</span>
<span style="color: #800080; font-weight: bold">@@ -25,7 +25,7 @@</span>
<setting name="FrontOnIncoming" serializeAs="String">
<value>True</value>
</setting>
<span style="color: #A00000">- <setting name="IncomingBallons" serializeAs="String"></span>
<span style="color: #00A000">+ <setting name="IncomingBalloons" serializeAs="String"></span>
<value>True</value>
</setting>
<setting name="HeadsetDevice" serializeAs="String">
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
multiple congratulates
<span style="color: #000080; font-weight: bold">diff --git a/intralanman/PHP/fs_curl/README b/intralanman/PHP/fs_curl/README</span>
<span style="color: #000080; font-weight: bold">index ec4930b..bc8d301 100644</span>
<span style="color: #A00000">--- a/intralanman/PHP/fs_curl/README</span>
<span style="color: #00A000">+++ b/intralanman/PHP/fs_curl/README</span>
<span style="color: #800080; font-weight: bold">@@ -181,7 +181,7 @@ you see this results</span>
<span style="color: #A00000">-CONGRADULATION... XML_CURL with intralan contrib working</span>
<span style="color: #00A000">+CONGRADULATIONS... XML_CURL with intralan contrib working</span>
now its your own, how you like to do next
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
testing
<span style="color: #000080; font-weight: bold">diff --git a/intralanman/PHP/fs_curl/README b/intralanman/PHP/fs_curl/README</span>
<span style="color: #000080; font-weight: bold">index 0fe8567..ec4930b 100644</span>
<span style="color: #A00000">--- a/intralanman/PHP/fs_curl/README</span>
<span style="color: #00A000">+++ b/intralanman/PHP/fs_curl/README</span>
<span style="color: #800080; font-weight: bold">@@ -197,4 +197,4 @@ try calling</span>
5000 - demo IVR (requires sounds and music files to be installed)
9995 - five second delay echo test
9996 - standard echo test
<span style="color: #A00000">-9999 - music on hold (requires music files to be installed) </span>
\ No newline at end of file
<span style="color: #00A000">+9999 - music on hold (requires music files to be installed) </span>
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
add quotes on path
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #000080; font-weight: bold">index b12ef37..3e6aaa1 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -252,7 +252,7 @@ if not exist ".\conf" md conf</span>
copy ..\..\"external items"\conf\freeswitch.xml .\conf</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<span style="color: #A00000">- <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy %25FREESWITCH_SRC_LOCATION%25\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent></span>
<span style="color: #00A000">+ <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25"\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent></span>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
try to fix the localization install fail again
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #000080; font-weight: bold">index b59f5f8..2e95778 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -18,7 +18,7 @@</span>
<Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*">
<File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" />
<CreateFolder Directory="INSTALLLOCATION">
<span style="color: #A00000">- <Permission User="Users" GenericAll="yes" /></span>
<span style="color: #00A000">+ <PermissionEx User="Users" GenericRead="yes" GenericWrite="yes" CreateFile="yes" xmlns="http://schemas.microsoft.com/wix/UtilExtension"/></span>
</CreateFolder>
</Component>
<Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*">
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #000080; font-weight: bold">index 62c873c..7fea603 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #800080; font-weight: bold">@@ -72,6 +72,10 @@</span>
</BootstrapperFile>
</ItemGroup>
<ItemGroup>
<span style="color: #00A000">+ <WixExtension Include="WixUtilExtension"></span>
<span style="color: #00A000">+ <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath></span>
<span style="color: #00A000">+ <Name>WixUtilExtension</Name></span>
<span style="color: #00A000">+ </WixExtension></span>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Reset contact search bar string on escape or dial
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index 0372d51..0195525 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -229,7 +229,7 @@ namespace FSClient {</span>
public void DialString(String str){
if (string.IsNullOrWhiteSpace(str))
return;
<span style="color: #A00000">- MainWindowRemoveFocus();</span>
<span style="color: #00A000">+ MainWindowRemoveFocus(true);</span>
if (str.StartsWith("#") && str.Length > 2) {
String acct_num = str.Substring(1, 1);
<span style="color: #800080; font-weight: bold">@@ -572,8 +572,8 @@ namespace FSClient {</span>
public OurAutoCompleteBox GetContactSearchBox() {
return MainWindow.get_instance().GetContactSearchBox();
}
<span style="color: #A00000">- public void MainWindowRemoveFocus(){</span>
<span style="color: #A00000">- MainWindow.get_instance().RemoveFocus();</span>
<span style="color: #00A000">+ public void MainWindowRemoveFocus(bool ResetContactSearchText=false){</span>
<span style="color: #00A000">+ MainWindow.get_instance().RemoveFocus(ResetContactSearchText);</span>
}
private delegate void BroadcastEventDel(FSEvent evt);
BroadcastEventDel BroadcastHandler;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #000080; font-weight: bold">index 2dd780b..2201cf0 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #800080; font-weight: bold">@@ -268,8 +268,10 @@ namespace FSClient {</span>
}
<span style="color: #A00000">- public void RemoveFocus(){</span>
<span style="color: #00A000">+ public void RemoveFocus(bool ResetContactSearchText=false){</span>
btnMute.Focus(); //should really divert focus a better way
<span style="color: #00A000">+ if (ResetContactSearchText)</span>
<span style="color: #00A000">+ ResetContactSearchStr();</span>
}
<span style="color: #800080; font-weight: bold">@@ -424,10 +426,11 @@ namespace FSClient {</span>
return txtSearchBox;
}
<span style="color: #00A000">+ private const string contact_search_text = "Contact Search";</span>
private void txtSearchBox_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e) {
text_interception_enabled = false;
txtSearchBox.Opacity = 1;
<span style="color: #A00000">- if (txtSearchBox.Text == "Contact Search")</span>
<span style="color: #00A000">+ if (txtSearchBox.Text == contact_search_text)</span>
txtSearchBox.Text = "";
}
<span style="color: #800080; font-weight: bold">@@ -436,7 +439,10 @@ namespace FSClient {</span>
txtSearchBox.Opacity = 0.8;
if (String.IsNullOrWhiteSpace(txtSearchBox.Text))
<span style="color: #A00000">- txtSearchBox.Text = "Contact Search";</span>
<span style="color: #00A000">+ ResetContactSearchStr();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public void ResetContactSearchStr(){</span>
<span style="color: #00A000">+ txtSearchBox.Text = contact_search_text;</span>
}
private bool ContactMenuOpen;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #000080; font-weight: bold">index d2fbc41..4575f30 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #800080; font-weight: bold">@@ -150,7 +150,7 @@ namespace FSClient</span>
if (e.Key == Key.Enter)
call_current_contact();
else if (e.Key == Key.Escape)
<span style="color: #A00000">- Broker.get_instance().MainWindowRemoveFocus();</span>
<span style="color: #00A000">+ Broker.get_instance().MainWindowRemoveFocus(true);</span>
}
protected OurAutoCompleteBox search_box;
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
Fix installation problem - with non English locales
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #000080; font-weight: bold">index ac22889..b59f5f8 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -18,7 +18,7 @@</span>
<Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*">
<File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" />
<CreateFolder Directory="INSTALLLOCATION">
<span style="color: #A00000">- <Permission User="Authenticated Users" GenericAll="yes" /></span>
<span style="color: #00A000">+ <Permission User="Users" GenericAll="yes" /></span>
</CreateFolder>
</Component>
<Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*">
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Minor text changes to make things clearer
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/README.txt b/mitchcapper/FSClient/README.txt</span>
<span style="color: #000080; font-weight: bold">index 6863643..68288a3 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/README.txt</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/README.txt</span>
<span style="color: #800080; font-weight: bold">@@ -22,7 +22,7 @@ Plugins</span>
There are two native headset plugins provided for Jabra and Plantronics headsets. If you do not have one of these you can still leave the plugin in the directory it will not harm anything. If you do have one of these headsets you will then be able to select the headset in the options. This will automatically open/close the audio link, support muting and buttons, caller id, etc in the headset. You may need the runtime/sdk for the headset installed for it to work.
Contact Plugins
<span style="color: #A00000">- There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc.</span>
<span style="color: #00A000">+ There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. Control +F or click in the contact search box on the bottom right, search by name right click for options. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc.</span>
Plugin Development
FSClient was made to make it easy to extend through plugins. The two plugin types supported are noted above. Writing a plugin is exceptionally easy, you simply inherit the base interface fill in a few functions and are good to go. Use the above for examples. As for how easy, well the SimpleXML Contact Plugin was written in under an hour and under 100 lines of code. Writing plugins is easiest in a .net language (although you can write them in any language). FSClient will try to load any plugins in the plugin dir.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #000080; font-weight: bold">index 15fd750..f33d963 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Sofia.cs</span>
<span style="color: #800080; font-weight: bold">@@ -126,7 +126,7 @@ namespace FSClient {</span>
master_profile_ok = true;
String res = Utils.api_exec("sofia", "status profile softphone");
if (res.Trim() == "Invalid Profile!") {
<span style="color: #A00000">- MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ") is free(set under the Advanced tab of in the sofia settings), otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save.");</span>
<span style="color: #00A000">+ MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ") is free(set under the Advanced tab of in the sofia settings) and FSClient is allowed through your firewall, otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save to see if fixed.");</span>
master_profile_ok = false;
}
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/TODO.txt b/mitchcapper/FSClient/TODO.txt</span>
<span style="color: #000080; font-weight: bold">index 7e3f1fb..4e65bb3 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/TODO.txt</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/TODO.txt</span>
<span style="color: #800080; font-weight: bold">@@ -1,4 +1,2 @@</span>
<span style="color: #A00000">-Better address book integration. Right now the integration is pretty lame to say the least, you cannot lookup contacts or do much in the way of editing them. I think a nice interm solution would be a control + f support to find a contact to atleast make outgoing calls. Right now contact plugins can add right click menus but maybe making a more central way for them to add right click options so they don't have to do so much work would be better.</span>
<span style="color: #A00000">-Volume control / gain. Right now you can use the system volume to adjust things but it would be nice to have this built into the GUI and also have a gain option. Gain would require changes to portaudio to support it most likely (although should be decently simple) or using set_audio_level. -- Partially implemented now with the ability to set audio levels on a call by right clicking on it.</span>
Plugin control, ability to enable or disable plugins from the options menu.
Figure out a way to sort codecs, a draggable combo box may work well.
\ No newline at end of file
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
add dependency for new file
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/FSClient.wxs b/mitchcapper/FSClient/Setup/FSClient.wxs</span>
<span style="color: #000080; font-weight: bold">index 68d0886..ba6960a 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/FSClient.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/FSClient.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -4,6 +4,7 @@</span>
<ComponentGroup Id="FSClientComp">
<ComponentRef Id="cmp98E16C7E23D449F3BC0ECF003543C3F9"/>
<ComponentRef Id="cmp32DB946E4669A895FAC4826678D1CE7A"/>
<span style="color: #00A000">+ <ComponentRef Id="cmpD17CBE22A3B94CCE9CF46B849289D40D"/></span>
</ComponentGroup>
<DirectoryRef Id="INSTALLLOCATION">
<Component Id="cmp98E16C7E23D449F3BC0ECF003543C3F9" Guid="*">
<span style="color: #800080; font-weight: bold">@@ -12,6 +13,9 @@</span>
<Component Id="cmp32DB946E4669A895FAC4826678D1CE7A" Guid="*">
<File Id="filE4CB78ABCF2AE91B89FB0446A607E70C" KeyPath="yes" Source="$(var.FSClient.TargetDir)\WPFToolkit.dll" />
</Component>
<span style="color: #00A000">+ <Component Id="cmpD17CBE22A3B94CCE9CF46B849289D40D" Guid="*"></span>
<span style="color: #00A000">+ <File Id="fil00037BE15D6A4893973045263EA4B117" KeyPath="yes" Source="$(var.FSClient.TargetDir)\System.Windows.Controls.Input.Toolkit.dll" /></span>
<span style="color: #00A000">+ </Component></span>
</DirectoryRef>
</Fragment>
</Wix>
\ No newline at end of file
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Make sure to hide the contact search box if no contact plugin supports it
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/IContactPlugin.cs b/mitchcapper/FSClient/IContactPlugin.cs</span>
<span style="color: #000080; font-weight: bold">index b064ff6..c1a1c24 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/IContactPlugin.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/IContactPlugin.cs</span>
<span style="color: #800080; font-weight: bold">@@ -5,9 +5,9 @@ using System.ComponentModel;</span>
using System.IO;
using System.Reflection;
using System.Windows;
<span style="color: #A00000">-using System.Windows.Controls;</span>
<span style="color: #A00000">-using FSClient.Controls;</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+using System.Windows.Controls;</span>
<span style="color: #00A000">+using FSClient.Controls;</span>
<span style="color: #00A000">+</span>
namespace FSClient {
public class ContactPluginManager : IDisposable {
private bool IsTypeOf(Type to_check, Type of) {
<span style="color: #800080; font-weight: bold">@@ -36,19 +36,24 @@ namespace FSClient {</span>
}
private void ContactInit(){
IContactPlugin plugin = plugins[0];
<span style="color: #A00000">- ContactMenuItems = plugin.ContactRightClickMenu();</span>
<span style="color: #00A000">+ ContactMenuItems = plugin.ContactRightClickMenu();</span>
OurAutoCompleteBox box = Broker.get_instance().GetContactSearchBox();
<span style="color: #A00000">- if (!plugin.HandleSearchBox(box))</span>
<span style="color: #A00000">- box.Visibility = Visibility.Collapsed;</span>
<span style="color: #00A000">+ if (plugin.HandleSearchBox(box))</span>
<span style="color: #00A000">+ box.Visibility = Visibility.Visible;</span>
}
private void HandleError(IContactPlugin plugin, Exception e) {
Utils.PluginLog("Contact Plugin Manager", "Plugin \"" + plugin.ProviderName() + "\" had an error Due to: " + e.Message);
}
<span style="color: #A00000">- public ContactPluginManager() {</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ public ContactPluginManager() {</span>
<span style="color: #00A000">+ OurAutoCompleteBox box = Broker.get_instance().GetContactSearchBox();</span>
<span style="color: #00A000">+ Application.Current.Dispatcher.BeginInvoke((Action) (() => {</span>
<span style="color: #00A000">+ box.Visibility = Visibility.Collapsed;</span>
<span style="color: #00A000">+ }));</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+</span>
String plugin_dir = Utils.plugins_dir();
string[] dlls;
try {
<span style="color: #800080; font-weight: bold">@@ -161,7 +166,7 @@ namespace FSClient {</span>
public abstract IEnumerable<MenuItem> ContactRightClickMenu();
public abstract void Initialize();
public abstract void Terminate();
<span style="color: #A00000">- public abstract string ProviderName();</span>
<span style="color: #00A000">+ public abstract string ProviderName();</span>
public abstract bool HandleSearchBox(OurAutoCompleteBox box);
}
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
remove passthrough codecs and align files with setup
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/External Items/conf/freeswitch.xml b/mitchcapper/FSClient/External Items/conf/freeswitch.xml</span>
<span style="color: #000080; font-weight: bold">index e2afea6..a297f69 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/External Items/conf/freeswitch.xml </span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/External Items/conf/freeswitch.xml </span>
<span style="color: #800080; font-weight: bold">@@ -55,8 +55,6 @@</span>
<load module="mod_dptools"/>
<load module="mod_dialplan_xml"/>
<load module="mod_spandsp"/>
<span style="color: #A00000">- <load module="mod_g723_1"/></span>
<span style="color: #A00000">- <load module="mod_amr"/></span>
<load module="mod_ilbc"/>
<load module="mod_speex"/>
<load module="mod_siren"/>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #000080; font-weight: bold">index a29cb51..f4e250c 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -240,7 +240,6 @@ if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Wi</span>
if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_sofia.dll .\mod
if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_speex.dll .\mod
if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_tone_stream.dll .\mod
<span style="color: #A00000">-if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_h26x.dll .\mod</span>
if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_silk.dll .\mod
if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_bv.dll .\mod
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #000080; font-weight: bold">index 7e1b42b..ac22889 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/FSCore.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -62,7 +62,6 @@</span>
<ComponentRef Id="cmp7F1E9A4820D7ABC50BB56176F1C5C203"/>
<ComponentRef Id="cmpB1F423B56230E52C4F261BB0A2D31A50"/>
<ComponentRef Id="cmpED6FDBCCBE7E25A518A406A7EEBF19E7"/>
<span style="color: #A00000">- <ComponentRef Id="cmpC32E981DE1987696848505946E7E40C7"/></span>
<ComponentRef Id="cmpBEC9C50CA6BEA1BDAA538AC014270ACA"/>
<ComponentRef Id="cmp484B206DD9362CCE151AE281DC2B9653"/>
<ComponentRef Id="cmp57A16823D68C54AF4DD1BEF68206C2E6"/>
<span style="color: #800080; font-weight: bold">@@ -98,9 +97,6 @@</span>
<Component Id="cmpED6FDBCCBE7E25A518A406A7EEBF19E7" Guid="*">
<File Id="fil2D28C6A5674AFCA7F9F1E06EEB33E823" KeyPath="yes" Source="$(var.FSClient.TargetDir)\mod\mod_event_socket.dll" />
</Component>
<span style="color: #A00000">- <Component Id="cmpC32E981DE1987696848505946E7E40C7" Guid="*"></span>
<span style="color: #A00000">- <File Id="filD5487CAC6CE60107178EA7AD41CDDA31" KeyPath="yes" Source="$(var.FSClient.TargetDir)\mod\mod_h26x.dll" /></span>
<span style="color: #A00000">- </Component></span>
<Component Id="cmpBEC9C50CA6BEA1BDAA538AC014270ACA" Guid="*">
<File Id="fil623B81F2BE4376CCA8C66EDB2EA2EBA8" KeyPath="yes" Source="$(var.FSClient.TargetDir)\mod\mod_ilbc.dll" />
</Component>
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
change project output paths add buildevents to copy fs depends if FREESWITCH_SRC_LOCATION environment variable is set
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #000080; font-weight: bold">index 8681ee7..a29cb51 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/FSClient.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -21,13 +21,28 @@</span>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<span style="color: #00A000">+ <PublishUrl>publish\</PublishUrl></span>
<span style="color: #00A000">+ <Install>true</Install></span>
<span style="color: #00A000">+ <InstallFrom>Disk</InstallFrom></span>
<span style="color: #00A000">+ <UpdateEnabled>false</UpdateEnabled></span>
<span style="color: #00A000">+ <UpdateMode>Foreground</UpdateMode></span>
<span style="color: #00A000">+ <UpdateInterval>7</UpdateInterval></span>
<span style="color: #00A000">+ <UpdateIntervalUnits>Days</UpdateIntervalUnits></span>
<span style="color: #00A000">+ <UpdatePeriodically>false</UpdatePeriodically></span>
<span style="color: #00A000">+ <UpdateRequired>false</UpdateRequired></span>
<span style="color: #00A000">+ <MapFileExtensions>true</MapFileExtensions></span>
<span style="color: #00A000">+ <ApplicationRevision>0</ApplicationRevision></span>
<span style="color: #00A000">+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion></span>
<span style="color: #00A000">+ <IsWebBootstrapper>false</IsWebBootstrapper></span>
<span style="color: #00A000">+ <UseApplicationTrust>false</UseApplicationTrust></span>
<span style="color: #00A000">+ <BootstrapperEnabled>true</BootstrapperEnabled></span>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<span style="color: #A00000">- <OutputPath>working\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>bin\Debug\</OutputPath></span>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #800080; font-weight: bold">@@ -172,7 +187,69 @@</span>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<span style="color: #00A000">+ <ItemGroup></span>
<span style="color: #00A000">+ <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client"></span>
<span style="color: #00A000">+ <Visible>False</Visible></span>
<span style="color: #00A000">+ <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName></span>
<span style="color: #00A000">+ <Install>true</Install></span>
<span style="color: #00A000">+ </BootstrapperPackage></span>
<span style="color: #00A000">+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5"></span>
<span style="color: #00A000">+ <Visible>False</Visible></span>
<span style="color: #00A000">+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName></span>
<span style="color: #00A000">+ <Install>false</Install></span>
<span style="color: #00A000">+ </BootstrapperPackage></span>
<span style="color: #00A000">+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"></span>
<span style="color: #00A000">+ <Visible>False</Visible></span>
<span style="color: #00A000">+ <ProductName>.NET Framework 3.5 SP1</ProductName></span>
<span style="color: #00A000">+ <Install>false</Install></span>
<span style="color: #00A000">+ </BootstrapperPackage></span>
<span style="color: #00A000">+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"></span>
<span style="color: #00A000">+ <Visible>False</Visible></span>
<span style="color: #00A000">+ <ProductName>Windows Installer 3.1</ProductName></span>
<span style="color: #00A000">+ <Install>true</Install></span>
<span style="color: #00A000">+ </BootstrapperPackage></span>
<span style="color: #00A000">+ </ItemGroup></span>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<span style="color: #00A000">+ <PropertyGroup></span>
<span style="color: #00A000">+ <PostBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\FreeSwitch.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libapr.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libaprutil.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libbroadvoice.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libspandsp.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libteletone.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\libeay32.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\ssleay32.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\pthread.dll .</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if not exist ".\mod" md mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_managed.dll .</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_spandsp.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_celt.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_commands.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_console.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_dialplan_xml.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_dptools.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_event_socket.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_ilbc.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_logfile.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_local_stream.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_loopback.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_PortAudio.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_siren.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_sndfile.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_sofia.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_speex.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_tone_stream.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_h26x.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_silk.dll .\mod</span>
<span style="color: #00A000">+if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25\"Win32\$(ConfigurationName)\mod\mod_bv.dll .\mod</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if not exist ".\conf" md conf</span>
<span style="color: #00A000">+copy ..\..\"external items"\conf\freeswitch.xml .\conf</PostBuildEvent></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<span style="color: #00A000">+ <PropertyGroup></span>
<span style="color: #00A000">+ <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy %25FREESWITCH_SRC_LOCATION%25\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent></span>
<span style="color: #00A000">+ </PropertyGroup></span>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/JabraHeadset/JabraHeadset.csproj b/mitchcapper/FSClient/JabraHeadset/JabraHeadset.csproj</span>
<span style="color: #000080; font-weight: bold">index 4908229..103d468 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/JabraHeadset/JabraHeadset.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/JabraHeadset/JabraHeadset.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -22,7 +22,7 @@</span>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<span style="color: #A00000">- <OutputPath>..\working\plugins\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Debug\plugins\</OutputPath></span>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #800080; font-weight: bold">@@ -31,7 +31,7 @@</span>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<span style="color: #A00000">- <OutputPath>bin\Release\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Release\plugins\</OutputPath></span>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/PlantronicsHeadset/PlantronicsHeadset.csproj b/mitchcapper/FSClient/PlantronicsHeadset/PlantronicsHeadset.csproj</span>
<span style="color: #000080; font-weight: bold">index 9a434b5..36099a7 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/PlantronicsHeadset/PlantronicsHeadset.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/PlantronicsHeadset/PlantronicsHeadset.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -23,7 +23,7 @@</span>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<span style="color: #A00000">- <OutputPath>..\working\plugins\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Debug\plugins\</OutputPath></span>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #800080; font-weight: bold">@@ -32,7 +32,7 @@</span>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<span style="color: #A00000">- <OutputPath>bin\Release\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Release\plugins\</OutputPath></span>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.csproj b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.csproj</span>
<span style="color: #000080; font-weight: bold">index a05acb1..1d3756f 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.csproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.csproj</span>
<span style="color: #800080; font-weight: bold">@@ -21,7 +21,7 @@</span>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<span style="color: #A00000">- <OutputPath>..\working\plugins\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Debug\plugins\</OutputPath></span>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<span style="color: #800080; font-weight: bold">@@ -29,7 +29,7 @@</span>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<span style="color: #A00000">- <OutputPath>bin\Release\</OutputPath></span>
<span style="color: #00A000">+ <OutputPath>..\bin\Release\plugins\</OutputPath></span>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
add setup to solution - more to come later
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/FSClient.sln b/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #000080; font-weight: bold">index c2301d9..ed5bc69 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/FSClient.sln</span>
<span style="color: #800080; font-weight: bold">@@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conf", "conf", "{BDB28E84-D</span>
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleXmlContactPlugin", "SimpleXmlContactPlugin\SimpleXmlContactPlugin.csproj", "{8DA31553-28E9-4A08-897E-7EE1E01356A3}"
EndProject
<span style="color: #00A000">+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{80D26E64-EECF-47F2-8132-804F087C27BA}"</span>
<span style="color: #00A000">+EndProject</span>
Global
GlobalSection(SourceCodeControl) = preSolution
SccNumberOfProjects = 5
<span style="color: #800080; font-weight: bold">@@ -84,6 +86,16 @@ Global</span>
{8DA31553-28E9-4A08-897E-7EE1E01356A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8DA31553-28E9-4A08-897E-7EE1E01356A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8DA31553-28E9-4A08-897E-7EE1E01356A3}.Release|x86.ActiveCfg = Release|Any CPU
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Debug|Any CPU.ActiveCfg = Debug|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Debug|Mixed Platforms.Build.0 = Debug|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Debug|x86.ActiveCfg = Debug|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Debug|x86.Build.0 = Debug|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Release|Any CPU.ActiveCfg = Release|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Release|Mixed Platforms.ActiveCfg = Release|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Release|Mixed Platforms.Build.0 = Release|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Release|x86.ActiveCfg = Release|x86</span>
<span style="color: #00A000">+ {80D26E64-EECF-47F2-8132-804F087C27BA}.Release|x86.Build.0 = Release|x86</span>
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
formatting
<span style="color: #000080; font-weight: bold">diff --git a/intralanman/PHP/fs_curl/configuration/conference.conf.php b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #000080; font-weight: bold">index 3441a10..3d0ad77 100644</span>
<span style="color: #A00000">--- a/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #00A000">+++ b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #800080; font-weight: bold">@@ -178,7 +178,7 @@ class conference_conf extends fs_configuration {</span>
$this -> xmlw -> startElement('control');
$this -> xmlw -> writeAttribute('action', $controls['action']);
$this -> xmlw -> writeAttribute('digits', $controls['digits']);
<span style="color: #A00000">- if($controls['data']) {$this -> xmlw -> writeAttribute('data', $controls['data']);}</span>
<span style="color: #00A000">+ if($controls['data']) {$this -> xmlw -> writeAttribute('data', $controls['data']);}</span>
$this -> xmlw -> endElement();
}
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
formatting
<span style="color: #000080; font-weight: bold">diff --git a/intralanman/PHP/fs_curl/configuration/conference.conf.php b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #000080; font-weight: bold">index cc77fc5..3441a10 100644</span>
<span style="color: #A00000">--- a/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #00A000">+++ b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #800080; font-weight: bold">@@ -34,13 +34,13 @@ class conference_conf extends fs_configuration {</span>
* @return void
*/
public function main() {
<span style="color: #A00000">- $this -> xmlw -> startElement('configuration');</span>
<span style="color: #A00000">- $this -> xmlw -> writeAttribute('name', 'conference.conf');</span>
<span style="color: #A00000">- $this -> xmlw -> writeAttribute('description', 'Audio Conference');</span>
<span style="color: #A00000">- $this -> write_advertises();</span>
<span style="color: #A00000">- if($this -> request['Controls']) {$this -> write_controls();}</span>
<span style="color: #00A000">+ $this -> xmlw -> startElement('configuration');</span>
<span style="color: #00A000">+ $this -> xmlw -> writeAttribute('name', 'conference.conf');</span>
<span style="color: #00A000">+ $this -> xmlw -> writeAttribute('description', 'Audio Conference');</span>
<span style="color: #00A000">+ $this -> write_advertises();</span>
<span style="color: #00A000">+ if($this -> request['Controls']) {$this -> write_controls();}</span>
if($this -> request['profile_name']) {$this -> write_profiles();}
<span style="color: #A00000">- $this -> xmlw -> endElement();</span>
<span style="color: #00A000">+ $this -> xmlw -> endElement();</span>
}
/**
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Raymond Chandler
comments:
thanks to Alex Goulis <alex@xpandercommunications.com>
<span style="color: #000080; font-weight: bold">diff --git a/intralanman/PHP/fs_curl/configuration/conference.conf.php b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #000080; font-weight: bold">index fd51a34..cc77fc5 100644</span>
<span style="color: #A00000">--- a/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #00A000">+++ b/intralanman/PHP/fs_curl/configuration/conference.conf.php</span>
<span style="color: #800080; font-weight: bold">@@ -34,9 +34,13 @@ class conference_conf extends fs_configuration {</span>
* @return void
*/
public function main() {
<span style="color: #00A000">+ $this -> xmlw -> startElement('configuration');</span>
<span style="color: #00A000">+ $this -> xmlw -> writeAttribute('name', 'conference.conf');</span>
<span style="color: #00A000">+ $this -> xmlw -> writeAttribute('description', 'Audio Conference');</span>
$this -> write_advertises();
<span style="color: #A00000">- $this -> write_controls();</span>
<span style="color: #A00000">- $this -> write_profiles();</span>
<span style="color: #00A000">+ if($this -> request['Controls']) {$this -> write_controls();}</span>
<span style="color: #00A000">+ if($this -> request['profile_name']) {$this -> write_profiles();}</span>
<span style="color: #00A000">+ $this -> xmlw -> endElement();</span>
}
/**
<span style="color: #800080; font-weight: bold">@@ -76,10 +80,9 @@ class conference_conf extends fs_configuration {</span>
* @return array
*/
private function get_profiles_array() {
<span style="color: #A00000">- $query = sprintf('%s %s;'</span>
<span style="color: #A00000">- , "SELECT * FROM conference_profiles"</span>
<span style="color: #A00000">- , "ORDER BY profile_name"</span>
<span style="color: #A00000">- );</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ $prof = $this -> request['profile_name'];</span>
<span style="color: #00A000">+ $query = "SELECT * FROM conference_profiles where profile_name='$prof'";</span>
$res = $this -> db -> query($query);
if (FS_PDO::isError($res)) {
$this -> comment($query);
<span style="color: #800080; font-weight: bold">@@ -130,8 +133,9 @@ class conference_conf extends fs_configuration {</span>
* @return array
*/
private function get_controls_array() {
<span style="color: #A00000">- $query = sprintf(</span>
<span style="color: #A00000">- "SELECT * FROM conference_controls ORDER BY conf_group"</span>
<span style="color: #00A000">+ $cont = $this -> request['Controls'];</span>
<span style="color: #00A000">+ $query = sprintf(</span>
<span style="color: #00A000">+ "SELECT * FROM conference_controls where conf_group = '$cont'"</span>
);
$res = $this -> db -> query($query);
if (FS_PDO::isError($res)) {
<span style="color: #800080; font-weight: bold">@@ -174,6 +178,7 @@ class conference_conf extends fs_configuration {</span>
$this -> xmlw -> startElement('control');
$this -> xmlw -> writeAttribute('action', $controls['action']);
$this -> xmlw -> writeAttribute('digits', $controls['digits']);
<span style="color: #00A000">+ if($controls['data']) {$this -> xmlw -> writeAttribute('data', $controls['data']);}</span>
$this -> xmlw -> endElement();
}
</pre></div>
<div class="highlight"><pre>committer: Mitch
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments:
Initial implementation of cisco-xml libs and MediaBrotha
Subject to major changes and more possibly lack of time
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/auth/index.php b/sathieu/cisco-xml/auth/index.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..0030ded</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/auth/index.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,3 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+echo 'AUTHORIZED';</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/browser/index.php b/sathieu/cisco-xml/browser/index.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..1f0ae25</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/browser/index.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,44 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of XML services for Cisco IP Phones.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ XML services for Cisco IP Phones is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ XML services for Cisco IP Phones is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with XML services for Cisco IP Phones. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+//* Debug</span>
<span style="color: #00A000">+ini_set('error_reporting', E_ALL | E_STRUCT);</span>
<span style="color: #00A000">+ini_set('display_errors', 1);</span>
<span style="color: #00A000">+// */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.'../lib');</span>
<span style="color: #00A000">+require('Cisco-XML/Cisco-XML.php');</span>
<span style="color: #00A000">+require_once('MediaBrotha/Core.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+MediaBrotha_Core::init();</span>
<span style="color: #00A000">+MediaBrotha_Core::connectFrontend('CiscoXML', Array('push_url' => 'http://cisco:cisco@192.168.0.220/CGI/Execute'));</span>
<span style="color: #00A000">+MediaBrotha_Core::loadBackend('FileSystem', Array('base_path' => '/home/share/music/'));</span>
<span style="color: #00A000">+MediaBrotha_Core::loadBackend('VLC', Array('http_intf' => 'http://127.0.0.1:8080'));</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+MediaBrotha_Core::go();</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..2253ca9</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,163 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of XML services for Cisco IP Phones.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ XML services for Cisco IP Phones is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ XML services for Cisco IP Phones is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with XML services for Cisco IP Phones. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class CiscoXMLField {</span>
<span style="color: #00A000">+ private $_allowed_fields = NULL;</span>
<span style="color: #00A000">+ private $_xml = NULL;</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ public function __construct($tag_name, $value = NULL, $parent = NULL, $allowed_fields = Array()) {</span>
<span style="color: #00A000">+ $this->_allowed_fields = $allowed_fields;</span>
<span style="color: #00A000">+ if (is_a($parent, 'DOMDocument')) {</span>
<span style="color: #00A000">+ $doc = $parent;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $doc = $parent->ownerDocument;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $this->_xml = $doc->createElement($tag_name);</span>
<span style="color: #00A000">+ if (is_array($value)) {</span>
<span style="color: #00A000">+ $this->setCiscoElements($value);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $this->_xml->nodeValue = htmlspecialchars($value);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $parent->appendChild($this->_xml);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function setCiscoElements($args) {</span>
<span style="color: #00A000">+ foreach ($args as $k => $v) {</span>
<span style="color: #00A000">+ $this->setCiscoElement($k, $v);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function setCiscoElement($name, $value) {</span>
<span style="color: #00A000">+ $short_name = preg_replace('/(:[^:]+)$/','', $name);</span>
<span style="color: #00A000">+ if (!array_key_exists($short_name, $this->_allowed_fields))</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ return new CiscoXMLField($short_name, $value, $this->_xml, $this->_allowed_fields[$short_name]);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class CiscoXMLObject {</span>
<span style="color: #00A000">+ protected $_allowed_fields = NULL;</span>
<span style="color: #00A000">+ private $_xml = NULL;</span>
<span style="color: #00A000">+ private $_root = NULL;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Constructor</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ public function __construct($args = Array()) {</span>
<span style="color: #00A000">+ if (!$this->_allowed_fields) {</span>
<span style="color: #00A000">+ die("Error: Unknow CiscoXMLObject '".get_class($this)."'");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $this->addAllowedFields();</span>
<span style="color: #00A000">+ $this->_xml = new DOMDocument('1.0', 'utf-8');</span>
<span style="color: #00A000">+ $this->_root = new CiscoXMLField(get_class($this), NULL, $this->_xml, $this->_allowed_fields);</span>
<span style="color: #00A000">+ $this->_root->setCiscoElements($args);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ protected function addAllowedFields() {</span>
<span style="color: #00A000">+ switch(get_class($this)) {</span>
<span style="color: #00A000">+ case 'CiscoIPPhoneStatus':</span>
<span style="color: #00A000">+ case 'CiscoIPPhoneExecute':</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ $this->_allowed_fields['SoftKeyItem'] = Array(</span>
<span style="color: #00A000">+ 'Name' => true,</span>
<span style="color: #00A000">+ 'URL' => true,</span>
<span style="color: #00A000">+ 'URLDown' => true,</span>
<span style="color: #00A000">+ 'Position' => true,</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Private methods</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Public methods</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ public function __toString() {</span>
<span style="color: #00A000">+ return $this->_xml->saveXML();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function setCiscoElement($name, $value) {</span>
<span style="color: #00A000">+ return $this->_root->setCiscoElement($name, $value);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function setCiscoElements($args) {</span>
<span style="color: #00A000">+ $this->_root->setCiscoElements($args);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ static public function HttpHeader() {</span>
<span style="color: #00A000">+ Header('Content-Type: text/xml');</span>
<span style="color: #00A000">+ header("Connection: close");</span>
<span style="color: #00A000">+ header("Expires: -1");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function execute($url) {</span>
<span style="color: #00A000">+ $opts = array('http' =></span>
<span style="color: #00A000">+ array(</span>
<span style="color: #00A000">+ 'method' => 'POST',</span>
<span style="color: #00A000">+ 'header' => 'Content-type: application/x-www-form-urlencoded',</span>
<span style="color: #00A000">+ 'content' => "XML=".urlencode($this)</span>
<span style="color: #00A000">+ )</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ $context = stream_context_create($opts);</span>
<span style="color: #00A000">+ return file_get_contents($url, false, $context);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class CiscoIPPhoneMenu extends CiscoXMLObject {</span>
<span style="color: #00A000">+ protected $_allowed_fields = Array(</span>
<span style="color: #00A000">+ 'Title' => true,</span>
<span style="color: #00A000">+ 'Prompt' => true,</span>
<span style="color: #00A000">+ 'MenuItem' => Array(</span>
<span style="color: #00A000">+ 'Name' => true,</span>
<span style="color: #00A000">+ 'URL' => true),</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class CiscoIPPhoneText extends CiscoXMLObject {</span>
<span style="color: #00A000">+ protected $_allowed_fields = Array(</span>
<span style="color: #00A000">+ 'Title' => true,</span>
<span style="color: #00A000">+ 'Prompt' => true,</span>
<span style="color: #00A000">+ 'Text' => true,</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class CiscoIPPhoneInput extends CiscoXMLObject {</span>
<span style="color: #00A000">+ protected $_allowed_fields = Array(</span>
<span style="color: #00A000">+ 'Title' => true,</span>
<span style="color: #00A000">+ 'Prompt' => true,</span>
<span style="color: #00A000">+ 'URL' => true,</span>
<span style="color: #00A000">+ 'InputItem' => Array(</span>
<span style="color: #00A000">+ 'DisplayName' => true,</span>
<span style="color: #00A000">+ 'QueryStringParam' => true,</span>
<span style="color: #00A000">+ 'DefaultValue' => true,</span>
<span style="color: #00A000">+ 'InputFlags' => true),</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..f85001b</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,104 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+require_once('MediaBrotha/Media.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Backend extends MediaBrotha_Media implements Iterator {</span>
<span style="color: #00A000">+ protected $_buffer = Array();</span>
<span style="color: #00A000">+ public function __construct($args = Array()) {</span>
<span style="color: #00A000">+ parent::__construct($args);</span>
<span style="color: #00A000">+ $this->register();</span>
<span style="color: #00A000">+ $this->setMimeType('application/x-mediabrotha-backend-'.strtolower($this->getName()));</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerMimeType($this, 'application/x-mediabrotha-backend-'.strtolower($this->getName()));</span>
<span style="color: #00A000">+ $this->setMetadata('name', $this->getName());</span>
<span style="color: #00A000">+ $this->setMetadata('uri', 'MediaBrotha_Backend://'.$this->getName());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function register() {</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerBackend($this);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function getName() {</span>
<span style="color: #00A000">+ return preg_replace('/^MediaBrotha_Backend_(.*)$/', '$1', get_class($this));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function isHidden() {</span>
<span style="color: #00A000">+ return parent::isHidden() || !in_array('browse', $this->capabilities());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability browse</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function rewind() {</span>
<span style="color: #00A000">+ reset($this->_buffer);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function current() {</span>
<span style="color: #00A000">+ return current($this->_buffer);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function key() {</span>
<span style="color: #00A000">+ return key($this->_buffer);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function next() {</span>
<span style="color: #00A000">+ return next($this->_buffer);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function valid() {</span>
<span style="color: #00A000">+ $key = key($this->_buffer);</span>
<span style="color: #00A000">+ $var = ($key !== NULL && $key !== FALSE);</span>
<span style="color: #00A000">+ return $var;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability play</span>
<span style="color: #00A000">+ public function play($media) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function pause() {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function stop() {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ // Capability playlist</span>
<span style="color: #00A000">+ public function playlistEnqueue($media) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function playlistNext($media) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function playlistPrevious($media) {</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..62fcb6f</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,87 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Backend_FileSystem extends MediaBrotha_Backend {</span>
<span style="color: #00A000">+ public function register() {</span>
<span style="color: #00A000">+ parent::register();</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerMimeType($this, 'application/x-directory');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function isURISafe($uri) {</span>
<span style="color: #00A000">+ $real_path = realpath(parse_url($uri, PHP_URL_PATH));</span>
<span style="color: #00A000">+ $real_base_path = realpath($this->getMetadata('base_path'));</span>
<span style="color: #00A000">+ do {</span>
<span style="color: #00A000">+ if ($real_path === $real_base_path) {</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ } while(($real_path != dirname($real_path)) && $real_path = dirname($real_path));</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ if ((parse_url($uri, PHP_URL_SCHEME) != 'file') || !$this->isURISafe($uri)) {</span>
<span style="color: #00A000">+ $uri = 'file://'.$this->getMetadata('base_path');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $this->_buffer = new DirectoryIterator(parse_url($uri, PHP_URL_PATH));</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ // Iterator</span>
<span style="color: #00A000">+ public function mediaFromFile($file) {</span>
<span style="color: #00A000">+ if ($file) {</span>
<span style="color: #00A000">+ $media = new MediaBrotha_Media(Array(</span>
<span style="color: #00A000">+ 'uri' => 'file://'.realpath($file->getPathname()),</span>
<span style="color: #00A000">+ 'name' => $file->getFilename(),</span>
<span style="color: #00A000">+ 'hidden' => !$file->isReadable() || preg_match('/^\.([^.]|$)/', $file->getFilename()),</span>
<span style="color: #00A000">+ ));</span>
<span style="color: #00A000">+ if ($file->isDir()) {</span>
<span style="color: #00A000">+ $media->setMimeType('application/x-directory');</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $finfo = new finfo(FILEINFO_MIME_TYPE);</span>
<span style="color: #00A000">+ $media->setMimeType($finfo->file($file->getPathname()));</span>
<span style="color: #00A000">+ $media->setMimeEncoding($finfo->file($file->getPathname(), FILEINFO_MIME_ENCODING));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return $media;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function current() {</span>
<span style="color: #00A000">+ return $this->mediaFromFile($this->_buffer->current());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function next() {</span>
<span style="color: #00A000">+ return $this->mediaFromFile($this->_buffer->next());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function valid() {</span>
<span style="color: #00A000">+ return $this->_buffer->valid();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..5e9c5fb</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,45 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Backend_Root extends MediaBrotha_Backend {</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ $this->_buffer = Array();</span>
<span style="color: #00A000">+ foreach(MediaBrotha_Core::getBackends() as $id => $backend) {</span>
<span style="color: #00A000">+ $this->_buffer[] = $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'browse',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function isHidden() {</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..03f5360</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,75 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
<span style="color: #00A000">+ public function register() {</span>
<span style="color: #00A000">+ parent::register();</span>
<span style="color: #00A000">+ MediaBrotha_Core::registerMimeType($this, 'audio/mpeg');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public function fetch($uri) {</span>
<span style="color: #00A000">+ $this->_buffer[] = new MediaBrotha_Media();</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function capabilities($uri = NULL, $mime_type = NULL, $mime_encoding = NULL) {</span>
<span style="color: #00A000">+ return Array(</span>
<span style="color: #00A000">+ 'play',</span>
<span style="color: #00A000">+ 'playlist',</span>
<span style="color: #00A000">+ );</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ private function send_command($command, $args = Array()) {</span>
<span style="color: #00A000">+ $url = $this->getMetadata('http_intf').</span>
<span style="color: #00A000">+ '/requests/status.xml'.</span>
<span style="color: #00A000">+ '?command='.$command;</span>
<span style="color: #00A000">+ foreach ($args as $k => $v) {</span>
<span style="color: #00A000">+ $url.= '&'.$k.'='.rawurlencode($v);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return fopen($url, 'r');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ // Capability play</span>
<span style="color: #00A000">+ public function play($media) {</span>
<span style="color: #00A000">+ return $this->send_command('in_play', Array('input' => $media->getURI()));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function pause() {</span>
<span style="color: #00A000">+ return $this->send_command('pl_pause');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function stop() {</span>
<span style="color: #00A000">+ return $this->send_command('pl_stop');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ // Capability playlist</span>
<span style="color: #00A000">+ public function playlistEnqueue($media) {</span>
<span style="color: #00A000">+ return $this->send_command('in_enqueue', Array('input' => $media->getURI()));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function playlistNext($media) {</span>
<span style="color: #00A000">+ return $this->send_command('pl_next');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function playlistPrevious($media) {</span>
<span style="color: #00A000">+ return $this->send_command('pl_previous');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Core.php b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..e31ee47</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Core.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,140 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+require_once('MediaBrotha/Backend.php');</span>
<span style="color: #00A000">+require_once('MediaBrotha/Frontend.php');</span>
<span style="color: #00A000">+require_once('MediaBrotha/Media.php');</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Core {</span>
<span style="color: #00A000">+ private static $_frontend = NULL;</span>
<span style="color: #00A000">+ private static $_backends = Array();</span>
<span style="color: #00A000">+ private static $_mime_types = Array();</span>
<span style="color: #00A000">+ private static $_media = NULL;</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ public static function init() {</span>
<span style="color: #00A000">+ MediaBrotha_Core::loadBackend('Root');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function go() {</span>
<span style="color: #00A000">+ $current_backend = MediaBrotha_Core::getCurrentBackend();</span>
<span style="color: #00A000">+ switch(MediaBrotha_Core::getAction()) {</span>
<span style="color: #00A000">+ case 'play':</span>
<span style="color: #00A000">+ $current_backend->play(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'pause':</span>
<span style="color: #00A000">+ $current_backend->pause(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'stop':</span>
<span style="color: #00A000">+ $current_backend->stop(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'pl_enqueue':</span>
<span style="color: #00A000">+ $current_backend->playlistEnqueue(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'pl_next':</span>
<span style="color: #00A000">+ $current_backend->playlistNext(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'pl_previous':</span>
<span style="color: #00A000">+ $current_backend->playlistPrevious(MediaBrotha_Core::getCurrentMedia());</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ case 'browse':</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ $current_backend->fetch(MediaBrotha_Core::getCurrentURI());</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->begin($current_backend);</span>
<span style="color: #00A000">+ foreach($current_backend as $item) {</span>
<span style="color: #00A000">+ if ($item->isHidden()) {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->addItem($item);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->finish($current_backend);</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend->render();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Backends</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ public static function loadBackend($provider_name, $args = Array()) {</span>
<span style="color: #00A000">+ $class_name = "MediaBrotha_Backend_${provider_name}";</span>
<span style="color: #00A000">+ if (!class_exists($class_name)) {</span>
<span style="color: #00A000">+ require_once("MediaBrotha/Backend/${provider_name}.php");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return new $class_name($args);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function registerBackend($backend) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_backends[] = $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function registerMimeType($backend, $mime_type) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_mime_types[$mime_type][] = $backend;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function getBackends() {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function getCurrentBackend() {</span>
<span style="color: #00A000">+ if (!empty($_GET['mime_type']) && !empty(MediaBrotha_Core::$_mime_types[$_GET['mime_type']])) {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_mime_types[$_GET['mime_type']][0];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_backends[0];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * Frontend</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ public static function connectFrontend($provider_name, $args = Array()) {</span>
<span style="color: #00A000">+ if (!$provider_name) {</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ $args['provider'] = $provider_name;</span>
<span style="color: #00A000">+ $class_name = "MediaBrotha_Frontend_$provider_name";</span>
<span style="color: #00A000">+ if (!class_exists($class_name)) {</span>
<span style="color: #00A000">+ require_once("MediaBrotha/Frontend/${provider_name}.php");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_frontend = new $class_name($args);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ /*</span>
<span style="color: #00A000">+ * ...</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+ public static function getAction() {</span>
<span style="color: #00A000">+ if (!empty($_GET['action'])) {</span>
<span style="color: #00A000">+ return $_GET['action'];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return 'browse';</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ public static function getCurrentURI() {</span>
<span style="color: #00A000">+ if (!empty($_GET['uri'])) {</span>
<span style="color: #00A000">+ return $_GET['uri'];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public static function getCurrentMedia() {</span>
<span style="color: #00A000">+ if (empty(MediaBrotha_Core::$_media)) {</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_media = new MediaBrotha_Media();</span>
<span style="color: #00A000">+ MediaBrotha_Core::$_media->setURI(MediaBrotha_Core::getCurrentURI());</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ return MediaBrotha_Core::$_media;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..9eab63c</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,36 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Frontend {</span>
<span style="color: #00A000">+ protected $_browser = NULL;</span>
<span style="color: #00A000">+ protected $_infos = NULL;</span>
<span style="color: #00A000">+ public function __construct($browser, $args = Array()) {</span>
<span style="color: #00A000">+ $this->_browser = $browser;</span>
<span style="color: #00A000">+ $this->_infos = $args;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..a0a9078</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,67 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend {</span>
<span style="color: #00A000">+ private $_xml = NULL;</span>
<span style="color: #00A000">+ public function begin($item) {</span>
<span style="color: #00A000">+ $this->_xml = new CiscoIPPhoneMenu();</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('Title', $item->getDisplayName());</span>
<span style="color: #00A000">+ //$this->_xml->setCiscoElement('Prompt', 'kk');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function addItem($item) {</span>
<span style="color: #00A000">+ $url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'].'?'.</span>
<span style="color: #00A000">+ 'mime_type='.urlencode($item->getMimeType()).'&'.</span>
<span style="color: #00A000">+ ($item->getMimeEncoding() ? ('mime_encoding='.urlencode($item->getMimeEncoding()).'&') : '').</span>
<span style="color: #00A000">+ 'uri='.urlencode($item->getURI());</span>
<span style="color: #00A000">+ //$url = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('MenuItem',</span>
<span style="color: #00A000">+ Array('Name' => $item->getDisplayName(), 'URL' => $url));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function finish() {</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Select', 'URL' => 'SoftKey:Select', 'Position' => '1'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Play', 'URL' => 'QueryStringParam:action=play', 'Position' => '2'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Pause', 'URL' => 'QueryStringParam:action=pause', 'Position' => '3'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Stop', 'URL' => 'QueryStringParam:action=stop', 'Position' => '4'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_enqueue', 'Position' => '5'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));</span>
<span style="color: #00A000">+ $this->_xml->setCiscoElement('SoftKeyItem',</span>
<span style="color: #00A000">+ Array('Name' => 'Quit', 'URL' => 'SoftKey:Exit', 'Position' => '8'));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function render() {</span>
<span style="color: #00A000">+ CiscoXMLObject::HttpHeader();</span>
<span style="color: #00A000">+ print $this->_xml;</span>
<span style="color: #00A000">+ //$this->_xml->execute($this->_infos['push_url']);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Media.php b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..0b50a52</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Media.php</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,92 @@</span>
<span style="color: #00A000">+<?php</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+Copyright 2011 Mathieu Parent <math.parent@gmail.com> </span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+This file is part of MediaBrotha.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is free software: you can</span>
<span style="color: #00A000">+ redistribute it and/or modify it under the terms of the GNU General</span>
<span style="color: #00A000">+ Public License as published by the Free Software Foundation, either</span>
<span style="color: #00A000">+ version 3 of the License, or (at your option) any later version.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ MediaBrotha is distributed in the hope that it</span>
<span style="color: #00A000">+ will be useful, but WITHOUT ANY WARRANTY; without even the implied</span>
<span style="color: #00A000">+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See</span>
<span style="color: #00A000">+ the GNU General Public License for more details.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ You should have received a copy of the GNU General Public License</span>
<span style="color: #00A000">+ along with MediaBrotha. If not, see</span>
<span style="color: #00A000">+ <http://www.gnu.org/licenses/>.</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+*/</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/**</span>
<span style="color: #00A000">+ * @author Mathieu Parent</span>
<span style="color: #00A000">+ */</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+class MediaBrotha_Media {</span>
<span style="color: #00A000">+ private $_metadata = Array();</span>
<span style="color: #00A000">+ private $_mimeType = NULL;</span>
<span style="color: #00A000">+ private $_mimeEncoding = NULL;</span>
<span style="color: #00A000">+ public function __construct($metadata = Array()) {</span>
<span style="color: #00A000">+ $this->_metadata = $metadata;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function setMimeType($mime_type) {</span>
<span style="color: #00A000">+ $this->_mimeType = $mime_type;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function getMimeType() {</span>
<span style="color: #00A000">+ // TODO</span>
<span style="color: #00A000">+ return $this->_mimeType;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function setMimeEncoding($mime_encoding) {</span>
<span style="color: #00A000">+ $this->_mimeEncoding = $mime_encoding;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function getMimeEncoding() {</span>
<span style="color: #00A000">+ // TODO</span>
<span style="color: #00A000">+ return $this->_mimeEncoding;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function getMetadata($name = NULL) {</span>
<span style="color: #00A000">+ if ($name === NULL) {</span>
<span style="color: #00A000">+ return $this->_metadata;</span>
<span style="color: #00A000">+ } elseif (isset($this->_metadata[$name])) {</span>
<span style="color: #00A000">+ return $this->_metadata[$name];</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ return NULL;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function setMetadata($name, $value) {</span>
<span style="color: #00A000">+ if (is_array($name)) {</span>
<span style="color: #00A000">+ $this->_metadata = $name;</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ $this->_metadata[$name] = $value;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ /* Most used metadata */</span>
<span style="color: #00A000">+ public function getDisplayName() {</span>
<span style="color: #00A000">+ return $this->getMetadata('name');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function getURI() {</span>
<span style="color: #00A000">+ return $this->getMetadata('uri');</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function setURI($value) {</span>
<span style="color: #00A000">+ return $this->setMetadata('uri', $value);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function getURIComponent($component) {</span>
<span style="color: #00A000">+ return parse_url($this->getURI($component));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ public function isHidden() {</span>
<span style="color: #00A000">+ return isset($this->_metadata['hidden']) && $this->_metadata['hidden'];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/*</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+Mandatory metadata:</span>
<span style="color: #00A000">+uri</span>
<span style="color: #00A000">+name</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+Usual metadata:</span>
<span style="color: #00A000">+artist</span>
<span style="color: #00A000">+album</span>
<span style="color: #00A000">+*/</span>
</pre></div>
========================================================================<pre>
Summary of changes:
intralanman/PHP/fs_curl/README | 4 +-
.../PHP/fs_curl/configuration/conference.conf.php | 23 +-
mcollins/wakeup_call/01_Wakeup_Call.xml | 50 ++
mcollins/wakeup_call/README | 12 +
mcollins/wakeup_call/date.doc.chm | Bin 0 -> 46674 bytes
mcollins/wakeup_call/date.doc.htm | 525 ++++++++++++++
mcollins/wakeup_call/date.lua | 745 ++++++++++++++++++++
mcollins/wakeup_call/mkcalendar.lua | 64 ++
mcollins/wakeup_call/mkisocal.lua | 41 ++
mcollins/wakeup_call/wakeup-call.lua | 123 ++++
mitchcapper/FSClient/Account.cs | 349 +++++++++
mitchcapper/FSClient/App.xaml | 396 +++++++++++
mitchcapper/FSClient/App.xaml.cs | 18 +
mitchcapper/FSClient/Broker.cs | 689 ++++++++++++++++++
mitchcapper/FSClient/Call.cs | 585 +++++++++++++++
.../FSClient/Controls/OurAutoCompleteBox.cs | 32 +
mitchcapper/FSClient/Controls/PhonePadButton.xaml | 27 +
.../FSClient/Controls/PhonePadButton.xaml.cs | 49 ++
mitchcapper/FSClient/Converters.cs | 124 ++++
mitchcapper/FSClient/DelayedFunction.cs | 58 ++
mitchcapper/FSClient/EventSocket.cs | 60 ++
.../FSClient/External Items/JabraTelephonyAPI.dll | Bin 0 -> 18944 bytes
.../External Items/Plantronics.Device.Common.dll | Bin 0 -> 154056 bytes
.../FSClient/External Items/conf/freeswitch.xml | 123 ++++
mitchcapper/FSClient/External Items/link.pl | 52 ++
.../FSClient/External Items/portaudio_notes.txt | 25 +
mitchcapper/FSClient/FSClient.csproj | 278 ++++++++
mitchcapper/FSClient/FSClient.sln | 107 +++
mitchcapper/FSClient/FSEvent.cs | 23 +
mitchcapper/FSClient/Field.cs | 115 +++
mitchcapper/FSClient/GenericEditor.xaml | 17 +
mitchcapper/FSClient/GenericEditor.xaml.cs | 184 +++++
mitchcapper/FSClient/IContactPlugin.cs | 198 ++++++
mitchcapper/FSClient/IHeadsetPlugin.cs | 419 +++++++++++
mitchcapper/FSClient/IPlugin.cs | 16 +
mitchcapper/FSClient/IncomingCallNotification.xaml | 33 +
.../FSClient/IncomingCallNotification.xaml.cs | 83 +++
mitchcapper/FSClient/InputBox.xaml | 24 +
mitchcapper/FSClient/InputBox.xaml.cs | 44 ++
.../FSClient/JabraHeadset/JabraHeadset.csproj | 70 ++
mitchcapper/FSClient/JabraHeadset/JabraProvider.cs | 202 ++++++
.../JabraHeadset/Properties/AssemblyInfo.cs | 36 +
mitchcapper/FSClient/MainWindow.xaml | 198 ++++++
mitchcapper/FSClient/MainWindow.xaml.cs | 465 ++++++++++++
mitchcapper/FSClient/ObservableClass.cs | 24 +
mitchcapper/FSClient/Options.xaml | 62 ++
mitchcapper/FSClient/Options.xaml.cs | 94 +++
.../PlantronicsHeadset/PlantronicsHeadset.csproj | 72 ++
.../PlantronicsHeadset/PlantronicsProvider.cs | 139 ++++
.../PlantronicsHeadset/Properties/AssemblyInfo.cs | 36 +
mitchcapper/FSClient/PluginManagerBase.cs | 147 ++++
mitchcapper/FSClient/PluginOptionsWindow.xaml | 42 ++
mitchcapper/FSClient/PluginOptionsWindow.xaml.cs | 120 ++++
mitchcapper/FSClient/PortAudio.cs | 149 ++++
mitchcapper/FSClient/Properties/AssemblyInfo.cs | 55 ++
.../FSClient/Properties/Resources.Designer.cs | 84 +++
mitchcapper/FSClient/Properties/Resources.resx | 130 ++++
.../FSClient/Properties/Settings.Designer.cs | 211 ++++++
mitchcapper/FSClient/Properties/Settings.settings | 54 ++
mitchcapper/FSClient/README.txt | 1 +
mitchcapper/FSClient/Setup/Banner.bmp | Bin 0 -> 2380 bytes
mitchcapper/FSClient/Setup/Dialog.bmp | Bin 0 -> 8896 bytes
mitchcapper/FSClient/Setup/FSClient.wxs | 17 +
mitchcapper/FSClient/Setup/FSCore.wxs | 145 ++++
mitchcapper/FSClient/Setup/Product.wxs | 112 +++
mitchcapper/FSClient/Setup/Setup.wixproj | 106 +++
mitchcapper/FSClient/SimpleContactPluginBase.cs | 217 ++++++
.../Properties/AssemblyInfo.cs | 36 +
.../SimpleXmlContactPlugin.cs | 98 +++
.../SimpleXmlContactPlugin.csproj | 65 ++
mitchcapper/FSClient/Sofia.cs | 146 ++++
mitchcapper/FSClient/Utils.cs | 126 ++++
mitchcapper/FSClient/Windows.cs | 38 +
mitchcapper/FSClient/XmlUtils.cs | 44 ++
mitchcapper/FSClient/app.config | 45 ++
mitchcapper/FSClient/phone.ico | Bin 0 -> 4286 bytes
mitchcapper/FSClient/phone_dnd.ico | Bin 0 -> 4286 bytes
mitchcapper/FSClient/warning.png | Bin 0 -> 4568 bytes
mitchcapper/SampleClient/App.xaml | 8 +
mitchcapper/SampleClient/App.xaml.cs | 14 +
.../SampleClient/FSSampleEmbeddedClient.zip | Bin 0 -> 11257 bytes
mitchcapper/SampleClient/MainWindow.xaml | 15 +
mitchcapper/SampleClient/MainWindow.xaml.cs | 115 +++
.../SampleClient/Properties/AssemblyInfo.cs | 55 ++
.../SampleClient/Properties/Resources.Designer.cs | 62 ++
.../SampleClient}/Properties/Resources.resx | 0
.../SampleClient/Properties/Settings.Designer.cs | 26 +
.../SampleClient/Properties/Settings.settings | 7 +
mitchcapper/SampleClient/SampleClient.csproj | 106 +++
mitchcapper/SampleClient/SampleClient.sln | 20 +
.../SampleClient/bin/Debug/conf/freeswitch.xml | 84 +++
.../SampleClient/bin/Debug/files_needed_here.txt | 11 +
.../bin/Debug/mod/files_needed_here.txt | 12 +
sathieu/cisco-xml/auth/index.php | 3 +
sathieu/cisco-xml/browser/index.php | 63 ++
sathieu/cisco-xml/browser/static/default.css | 49 ++
sathieu/cisco-xml/browser/static/dynamic.js | 4 +
sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php | 174 +++++
sathieu/cisco-xml/lib/MediaBrotha/Backend.php | 93 +++
.../lib/MediaBrotha/Backend/FileSystem.php | 117 +++
sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php | 181 +++++
sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php | 60 ++
sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php | 86 +++
sathieu/cisco-xml/lib/MediaBrotha/Core.php | 222 ++++++
sathieu/cisco-xml/lib/MediaBrotha/Form.php | 55 ++
sathieu/cisco-xml/lib/MediaBrotha/Frontend.php | 42 ++
.../lib/MediaBrotha/Frontend/CiscoXML.php | 117 +++
.../cisco-xml/lib/MediaBrotha/Frontend/HTML.php | 193 +++++
.../cisco-xml/lib/MediaBrotha/Frontend/HTTP.php | 37 +
sathieu/cisco-xml/lib/MediaBrotha/Media.php | 124 ++++
.../cisco-xml/lib/MediaBrotha/MediaIterator.php | 69 ++
111 files changed, 11514 insertions(+), 11 deletions(-)
create mode 100644 mcollins/wakeup_call/01_Wakeup_Call.xml
create mode 100644 mcollins/wakeup_call/README
create mode 100644 mcollins/wakeup_call/date.doc.chm
create mode 100644 mcollins/wakeup_call/date.doc.htm
create mode 100644 mcollins/wakeup_call/date.lua
create mode 100644 mcollins/wakeup_call/mkcalendar.lua
create mode 100644 mcollins/wakeup_call/mkisocal.lua
create mode 100644 mcollins/wakeup_call/wakeup-call.lua
create mode 100644 mitchcapper/FSClient/Account.cs
create mode 100644 mitchcapper/FSClient/App.xaml
create mode 100644 mitchcapper/FSClient/App.xaml.cs
create mode 100644 mitchcapper/FSClient/Broker.cs
create mode 100644 mitchcapper/FSClient/Call.cs
create mode 100644 mitchcapper/FSClient/Controls/OurAutoCompleteBox.cs
create mode 100644 mitchcapper/FSClient/Controls/PhonePadButton.xaml
create mode 100644 mitchcapper/FSClient/Controls/PhonePadButton.xaml.cs
create mode 100644 mitchcapper/FSClient/Converters.cs
create mode 100644 mitchcapper/FSClient/DelayedFunction.cs
create mode 100644 mitchcapper/FSClient/EventSocket.cs
create mode 100644 mitchcapper/FSClient/External Items/JabraTelephonyAPI.dll
create mode 100644 mitchcapper/FSClient/External Items/Plantronics.Device.Common.dll
create mode 100644 mitchcapper/FSClient/External Items/conf/freeswitch.xml
create mode 100644 mitchcapper/FSClient/External Items/link.pl
create mode 100644 mitchcapper/FSClient/External Items/portaudio_notes.txt
create mode 100644 mitchcapper/FSClient/FSClient.csproj
create mode 100644 mitchcapper/FSClient/FSClient.sln
create mode 100644 mitchcapper/FSClient/FSEvent.cs
create mode 100644 mitchcapper/FSClient/Field.cs
create mode 100644 mitchcapper/FSClient/GenericEditor.xaml
create mode 100644 mitchcapper/FSClient/GenericEditor.xaml.cs
create mode 100644 mitchcapper/FSClient/IContactPlugin.cs
create mode 100644 mitchcapper/FSClient/IHeadsetPlugin.cs
create mode 100644 mitchcapper/FSClient/IPlugin.cs
create mode 100644 mitchcapper/FSClient/IncomingCallNotification.xaml
create mode 100644 mitchcapper/FSClient/IncomingCallNotification.xaml.cs
create mode 100644 mitchcapper/FSClient/InputBox.xaml
create mode 100644 mitchcapper/FSClient/InputBox.xaml.cs
create mode 100644 mitchcapper/FSClient/JabraHeadset/JabraHeadset.csproj
create mode 100644 mitchcapper/FSClient/JabraHeadset/JabraProvider.cs
create mode 100644 mitchcapper/FSClient/JabraHeadset/Properties/AssemblyInfo.cs
create mode 100644 mitchcapper/FSClient/MainWindow.xaml
create mode 100644 mitchcapper/FSClient/MainWindow.xaml.cs
create mode 100644 mitchcapper/FSClient/ObservableClass.cs
create mode 100644 mitchcapper/FSClient/Options.xaml
create mode 100644 mitchcapper/FSClient/Options.xaml.cs
create mode 100644 mitchcapper/FSClient/PlantronicsHeadset/PlantronicsHeadset.csproj
create mode 100644 mitchcapper/FSClient/PlantronicsHeadset/PlantronicsProvider.cs
create mode 100644 mitchcapper/FSClient/PlantronicsHeadset/Properties/AssemblyInfo.cs
create mode 100644 mitchcapper/FSClient/PluginManagerBase.cs
create mode 100644 mitchcapper/FSClient/PluginOptionsWindow.xaml
create mode 100644 mitchcapper/FSClient/PluginOptionsWindow.xaml.cs
create mode 100644 mitchcapper/FSClient/PortAudio.cs
create mode 100644 mitchcapper/FSClient/Properties/AssemblyInfo.cs
create mode 100644 mitchcapper/FSClient/Properties/Resources.Designer.cs
create mode 100644 mitchcapper/FSClient/Properties/Resources.resx
create mode 100644 mitchcapper/FSClient/Properties/Settings.Designer.cs
create mode 100644 mitchcapper/FSClient/Properties/Settings.settings
create mode 100644 mitchcapper/FSClient/README.txt
create mode 100644 mitchcapper/FSClient/Setup/Banner.bmp
create mode 100644 mitchcapper/FSClient/Setup/Dialog.bmp
create mode 100644 mitchcapper/FSClient/Setup/FSClient.wxs
create mode 100644 mitchcapper/FSClient/Setup/FSCore.wxs
create mode 100644 mitchcapper/FSClient/Setup/Product.wxs
create mode 100644 mitchcapper/FSClient/Setup/Setup.wixproj
create mode 100644 mitchcapper/FSClient/SimpleContactPluginBase.cs
create mode 100644 mitchcapper/FSClient/SimpleXmlContactPlugin/Properties/AssemblyInfo.cs
create mode 100644 mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs
create mode 100644 mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.csproj
create mode 100644 mitchcapper/FSClient/Sofia.cs
create mode 100644 mitchcapper/FSClient/Utils.cs
create mode 100644 mitchcapper/FSClient/Windows.cs
create mode 100644 mitchcapper/FSClient/XmlUtils.cs
create mode 100644 mitchcapper/FSClient/app.config
create mode 100644 mitchcapper/FSClient/phone.ico
create mode 100644 mitchcapper/FSClient/phone_dnd.ico
create mode 100644 mitchcapper/FSClient/warning.png
create mode 100644 mitchcapper/SampleClient/App.xaml
create mode 100644 mitchcapper/SampleClient/App.xaml.cs
create mode 100644 mitchcapper/SampleClient/FSSampleEmbeddedClient.zip
create mode 100644 mitchcapper/SampleClient/MainWindow.xaml
create mode 100644 mitchcapper/SampleClient/MainWindow.xaml.cs
create mode 100644 mitchcapper/SampleClient/Properties/AssemblyInfo.cs
create mode 100644 mitchcapper/SampleClient/Properties/Resources.Designer.cs
copy {verifier/EventSocket/trunk/EventWatcher => mitchcapper/SampleClient}/Properties/Resources.resx (100%)
create mode 100644 mitchcapper/SampleClient/Properties/Settings.Designer.cs
create mode 100644 mitchcapper/SampleClient/Properties/Settings.settings
create mode 100644 mitchcapper/SampleClient/SampleClient.csproj
create mode 100644 mitchcapper/SampleClient/SampleClient.sln
create mode 100644 mitchcapper/SampleClient/bin/Debug/conf/freeswitch.xml
create mode 100644 mitchcapper/SampleClient/bin/Debug/files_needed_here.txt
create mode 100644 mitchcapper/SampleClient/bin/Debug/mod/files_needed_here.txt
create mode 100644 sathieu/cisco-xml/auth/index.php
create mode 100644 sathieu/cisco-xml/browser/index.php
create mode 100644 sathieu/cisco-xml/browser/static/default.css
create mode 100644 sathieu/cisco-xml/browser/static/dynamic.js
create mode 100644 sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend/FileSystem.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Core.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Form.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Media.php
create mode 100644 sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH user-contributed scripts, etc</p>