Skip to content
Browse files

uses attributes for objects

git-svn-id: https://osctools.svn.sourceforge.net/svnroot/osctools/trunk@24 8d86b230-aa17-0410-9ab0-97cb6adfeffd
  • Loading branch information...
1 parent abc3c16 commit ce4afd7c64bb8fc09b8e7c49f8915a27588547d4 remymuller committed
View
30 maxmsp externals/oscbonjour/oscbonjour.xcodeproj/muller.pbxuser
@@ -69,12 +69,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 271629791;
- PBXWorkspaceStateSaveDate = 271629791;
- };
- perUserProjectItems = {
- 45CC344C1030D62F0057043E /* PBXTextBookmark */ = 45CC344C1030D62F0057043E /* PBXTextBookmark */;
- 45CC344D1030D62F0057043E /* PBXTextBookmark */ = 45CC344D1030D62F0057043E /* PBXTextBookmark */;
+ PBXPerProjectTemplateStateSaveDate = 271669412;
+ PBXWorkspaceStateSaveDate = 271669412;
};
sourceControlManager = 45A57D6A0B04F81200FF8034 /* Source Control */;
userBuildSettings = {
@@ -116,26 +112,6 @@
modificationTime = 271635871.695774;
state = 1;
};
- 45CC344C1030D62F0057043E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 56F0EDEB0B04DDAD00FAAA58 /* oscbonjour.cpp */;
- name = "oscbonjour.cpp: 269";
- rLen = 7;
- rLoc = 9314;
- rType = 0;
- vrLen = 1406;
- vrLoc = 6164;
- };
- 45CC344D1030D62F0057043E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 56F0EDEB0B04DDAD00FAAA58 /* oscbonjour.cpp */;
- name = "oscbonjour.cpp: 102";
- rLen = 0;
- rLoc = 3219;
- rType = 0;
- vrLen = 1296;
- vrLoc = 8260;
- };
45EB42961030808500AB8A5C /* Thread.cpp */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1084, 2842}}";
@@ -145,7 +121,7 @@
};
45EB42A3103080A600AB8A5C /* maxmspsdk.xcconfig */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1090, 546}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1084, 546}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 1280}";
};
View
152 maxmsp externals/zeroconf_browser/zeroconf.browser.cpp
@@ -30,6 +30,8 @@
#include "zeroconf/NetServiceBrowser.h"
#include "zeroconf/NetService.h"
#include <iostream>
+#include <string>
+#include <set>
using namespace ZeroConf;
@@ -38,6 +40,8 @@ class Browser;
struct zeroconf_browser
{
t_object ob; // the object itself (must be first)
+ t_symbol *type;
+ t_symbol *domain;
void *out;
Browser *mpBrowser;
};
@@ -45,30 +49,67 @@ struct zeroconf_browser
class Browser : public NetServiceBrowser, public NetServiceBrowserListener
{
zeroconf_browser *mpExternal;
-
+ std::set<std::string> mServices;
+ CriticalSection mCriticalSection; // CriticalSection for shared access to mServices
+
public:
Browser(zeroconf_browser *x)
- : mpExternal(x)
+ : NetServiceBrowser()
+ , mpExternal(x)
{
setListener(this);
}
-
+
+ void search(const std::string &type, const std::string &domain)
+ {
+ if(!type.empty())
+ {
+ stop();
+ {
+ ScopedLock lock(mCriticalSection);
+ mServices.clear();
+ }
+ searchForServicesOfType(type, domain);
+ }
+ }
+
private:
virtual void didFindDomain(NetServiceBrowser *pNetServiceBrowser, const std::string &domainName, bool moreDomainsComing) { }
virtual void didRemoveDomain(NetServiceBrowser *pNetServiceBrowser, const std::string &domainName, bool moreDomainsComing) { }
+
+ void outputListOfServices()
+ {
+ t_atom at[1];
+ outlet_anything(mpExternal->out, gensym("clear"), 0, NULL);
+
+ ScopedLock lock(mCriticalSection);
+ for(std::set<std::string>::iterator it=mServices.begin(); it != mServices.end(); ++it)
+ {
+ atom_setsym(at, gensym(const_cast<char*>(it->c_str())));
+ outlet_anything(mpExternal->out, gensym("append"), 1, at);
+ }
+ }
virtual void didFindService(NetServiceBrowser* pNetServiceBrowser, NetService *pNetService, bool moreServicesComing)
{
- t_atom at[1];
- atom_setsym(at, gensym(const_cast<char*>(pNetService->getName().c_str())));
- outlet_anything(mpExternal->out, gensym("append"), 1, at);
+ {
+ ScopedLock lock(mCriticalSection);
+ mServices.insert(pNetService->getName());
+ }
+
+ if(!moreServicesComing)
+ outputListOfServices();
}
virtual void didRemoveService(NetServiceBrowser *pNetServiceBrowser, NetService *pNetService, bool moreServicesComing)
{
- t_atom at[1];
- atom_setsym(at, gensym(const_cast<char*>(pNetService->getName().c_str())));
- outlet_anything(mpExternal->out, gensym("delete"), 1, at);
+ {
+ ScopedLock lock(mCriticalSection);
+ mServices.erase(pNetService->getName());
+ }
+
+ if(!moreServicesComing)
+ outputListOfServices();
}
virtual void willSearch(NetServiceBrowser *pNetServiceBrowser) { }
@@ -79,36 +120,33 @@ class Browser : public NetServiceBrowser, public NetServiceBrowserListener
//------------------------------------------------------------------------------
t_class *zeroconf_browser_class;
-void zeroconf_browser_browse(zeroconf_browser *x, t_symbol *s, long argc, t_atom *argv)
+void zeroconf_browser_bang(zeroconf_browser *x)
{
- char *type = NULL;
- char *domain = "local.";
-
- switch(argc)
- {
- case 2:
- if(argv[1].a_type == A_SYM)
- {
- domain = atom_getsym(argv+1)->s_name;
- }
- case 1:
- if(argv[0].a_type == A_SYM)
- {
- type = atom_getsym(argv+0)->s_name;
- }
- default:
- break;
- }
-
- if(type != NULL)
- {
- if(x->mpBrowser)
- delete x->mpBrowser;
- x->mpBrowser = NULL;
-
- x->mpBrowser = new Browser(x);
- x->mpBrowser->searchForServicesOfType(type, domain);
- }
+ x->mpBrowser->search(x->type->s_name, x->domain->s_name);
+}
+
+void zeroconf_browser_browse(zeroconf_browser *x, t_symbol *s, long argc, t_atom *argv)
+{
+ bool valid = false;
+ switch(argc)
+ {
+ case 2:
+ if(argv[1].a_type == A_SYM)
+ {
+ x->domain = atom_getsym(argv+1);
+ }
+ case 1:
+ if(argv[0].a_type == A_SYM)
+ {
+ valid = true;
+ x->type = atom_getsym(argv+0);
+ }
+ default:
+ break;
+ }
+
+ if(valid)
+ zeroconf_browser_bang(x);
}
void zeroconf_browser_assist(zeroconf_browser *x, void *b, long m, long a, char *s)
@@ -138,31 +176,10 @@ void *zeroconf_browser_new(t_symbol *s, long argc, t_atom *argv)
if (x = (zeroconf_browser *)object_alloc(zeroconf_browser_class))
{
x->out = outlet_new(x, NULL);
- x->mpBrowser = NULL;
- char *type = NULL;
- char *domain = "local";
-
- switch(argc)
- {
- case 2:
- if(argv[1].a_type == A_SYM)
- {
- domain = atom_getsym(argv+1)->s_name;
- }
- case 1:
- if(argv[0].a_type == A_SYM)
- {
- type = atom_getsym(argv+1)->s_name;
- }
- default:
- break;
- }
-
- if(type != NULL)
- {
- x->mpBrowser = new Browser(x);
- x->mpBrowser->searchForServicesOfType(type, domain);
- }
+ x->type = gensym("");
+ x->domain = gensym("local.");
+ x->mpBrowser = new Browser(x);
+ attr_args_process(x, argc, argv);
}
return (x);
}
@@ -171,8 +188,13 @@ int main(void)
{
t_class *c = class_new("zeroconf.browser", (method)zeroconf_browser_new, (method)zeroconf_browser_free, (long)sizeof(zeroconf_browser), 0L, A_GIMME, 0);
- class_addmethod(c, (method)zeroconf_browser_browse, "browse", A_GIMME, 0);
- class_addmethod(c, (method)zeroconf_browser_assist, "assist", A_CANT, 0);
+ class_addmethod(c, (method)zeroconf_browser_bang, "bang", 0);
+ class_addmethod(c, (method)zeroconf_browser_bang, "loadbang", 0);
+ class_addmethod(c, (method)zeroconf_browser_browse, "browse", A_GIMME, 0);
+ class_addmethod(c, (method)zeroconf_browser_assist, "assist", A_CANT, 0);
+
+ CLASS_ATTR_SYM(c, "type", 0, zeroconf_browser, type);
+ CLASS_ATTR_SYM(c, "domain", 0, zeroconf_browser, domain);
class_register(CLASS_BOX, c); /* CLASS_NOBOX */
zeroconf_browser_class = c;
View
8 maxmsp externals/zeroconf_browser/zeroconf.browser.maxhelp
@@ -48,7 +48,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.service \"Open Sound Control UDP Service\" 4321 _osc._udp",
+ "text" : "zeroconf.service @name \"Open Sound Control UDP Service\" @port 4321 @type _osc._udp",
"numinlets" : 1,
"numoutlets" : 0,
"id" : "obj-5",
@@ -61,7 +61,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.service \"Un autre service\" 6666 _osc._udp",
+ "text" : "zeroconf.service @name \"Un autre service\" @port 6666 @type _osc._udp",
"numinlets" : 1,
"numoutlets" : 0,
"id" : "obj-6",
@@ -74,7 +74,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.service \"Open Sound Control UDP Service\" 12345 _osc._udp",
+ "text" : "zeroconf.service @name \"Open Sound Control UDP Service\" @port 12345 @type _osc._udp",
"numinlets" : 1,
"numoutlets" : 0,
"id" : "obj-4",
@@ -114,7 +114,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.browser _smb._tcp",
+ "text" : "zeroconf.browser @type _smb._tcp @domain local.",
"numinlets" : 1,
"numoutlets" : 1,
"id" : "obj-1",
View
252 maxmsp externals/zeroconf_browser/zeroconf.browser.xcodeproj/muller.pbxuser
@@ -34,7 +34,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 873,
+ 10,
20,
48,
43,
@@ -73,28 +73,32 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 271632093;
- PBXWorkspaceStateSaveDate = 271632093;
+ PBXPerProjectTemplateStateSaveDate = 271673807;
+ PBXWorkspaceStateSaveDate = 271673807;
};
perUserProjectItems = {
- 4542E6C510305E2600C13320 /* PBXTextBookmark */ = 4542E6C510305E2600C13320 /* PBXTextBookmark */;
- 45CC337B1030B9060057043E /* PBXTextBookmark */ = 45CC337B1030B9060057043E /* PBXTextBookmark */;
- 45CC337D1030B9060057043E /* PBXTextBookmark */ = 45CC337D1030B9060057043E /* PBXTextBookmark */;
- 45CC33E71030D0B20057043E /* PBXTextBookmark */ = 45CC33E71030D0B20057043E /* PBXTextBookmark */;
- 45CC33EA1030D0B20057043E /* PBXTextBookmark */ = 45CC33EA1030D0B20057043E /* PBXTextBookmark */;
- 45CC33EB1030D0B20057043E /* PBXTextBookmark */ = 45CC33EB1030D0B20057043E /* PBXTextBookmark */;
- 45CC33EC1030D0B20057043E /* PBXTextBookmark */ = 45CC33EC1030D0B20057043E /* PBXTextBookmark */;
- 45CC33ED1030D0B20057043E /* PBXTextBookmark */ = 45CC33ED1030D0B20057043E /* PBXTextBookmark */;
- 45CC33EE1030D0B20057043E /* PBXTextBookmark */ = 45CC33EE1030D0B20057043E /* PBXTextBookmark */;
- 45CC33F01030D0B20057043E /* PBXTextBookmark */ = 45CC33F01030D0B20057043E /* PBXTextBookmark */;
- 45CC33F11030D0B20057043E /* PBXTextBookmark */ = 45CC33F11030D0B20057043E /* PBXTextBookmark */;
- 45CC342B1030D3930057043E /* PBXTextBookmark */ = 45CC342B1030D3930057043E /* PBXTextBookmark */;
- 45CC34381030D5DF0057043E /* PBXTextBookmark */ = 45CC34381030D5DF0057043E /* PBXTextBookmark */;
- 45CC34391030D5DF0057043E /* PBXTextBookmark */ = 45CC34391030D5DF0057043E /* PBXTextBookmark */;
- 45CC343A1030D5DF0057043E /* PBXTextBookmark */ = 45CC343A1030D5DF0057043E /* PBXTextBookmark */;
- 45CC343B1030D5DF0057043E /* PBXTextBookmark */ = 45CC343B1030D5DF0057043E /* PBXTextBookmark */;
- 45EB41AE1030755300AB8A5C /* PBXTextBookmark */ = 45EB41AE1030755300AB8A5C /* PBXTextBookmark */;
- 45EB41B21030755300AB8A5C /* PBXTextBookmark */ = 45EB41B21030755300AB8A5C /* PBXTextBookmark */;
+ 4542E6C510305E2600C13320 = 4542E6C510305E2600C13320 /* PBXTextBookmark */;
+ 45CC337B1030B9060057043E = 45CC337B1030B9060057043E /* PBXTextBookmark */;
+ 45CC337D1030B9060057043E = 45CC337D1030B9060057043E /* PBXTextBookmark */;
+ 45CC33EA1030D0B20057043E = 45CC33EA1030D0B20057043E /* PBXTextBookmark */;
+ 45CC33EC1030D0B20057043E = 45CC33EC1030D0B20057043E /* PBXTextBookmark */;
+ 45EB41AE1030755300AB8A5C = 45EB41AE1030755300AB8A5C /* PBXTextBookmark */;
+ 45EB41B21030755300AB8A5C = 45EB41B21030755300AB8A5C /* PBXTextBookmark */;
+ 45EB42ED10315FEC00AB8A5C = 45EB42ED10315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42EE10315FEC00AB8A5C = 45EB42EE10315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F010315FEC00AB8A5C = 45EB42F010315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F110315FEC00AB8A5C = 45EB42F110315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F210315FEC00AB8A5C = 45EB42F210315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F310315FEC00AB8A5C = 45EB42F310315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F410315FEC00AB8A5C = 45EB42F410315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F510315FEC00AB8A5C = 45EB42F510315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F610315FEC00AB8A5C = 45EB42F610315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB42F710315FEC00AB8A5C = 45EB42F710315FEC00AB8A5C /* PBXTextBookmark */;
+ 45EB43731031690B00AB8A5C = 45EB43731031690B00AB8A5C /* PBXTextBookmark */;
+ 45EB43761031690B00AB8A5C = 45EB43761031690B00AB8A5C /* PBXTextBookmark */;
+ 45EB43771031690B00AB8A5C = 45EB43771031690B00AB8A5C /* PBXTextBookmark */;
+ 45EB4380103169C400AB8A5C = 45EB4380103169C400AB8A5C /* PBXTextBookmark */;
+ 45EB4381103169C800AB8A5C = 45EB4381103169C800AB8A5C /* PBXTextBookmark */;
};
sourceControlManager = 4542E5F8103049ED00C13320 /* Source Control */;
userBuildSettings = {
@@ -230,28 +234,28 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 141;
- modificationTime = 271635875.808212;
- state = 1;
+ modificationTime = 271673681.247368;
+ state = 0;
};
4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1379, 2254}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1051, 2324}}";
sepNavSelRange = "{1961, 67}";
- sepNavVisRange = "{1733, 374}";
+ sepNavVisRange = "{1901, 766}";
};
};
4542E6B810305AED00C13320 /* NetServiceBrowser.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1051, 1526}}";
sepNavSelRange = "{4939, 0}";
- sepNavVisRange = "{2346, 2881}";
+ sepNavVisRange = "{3304, 1910}";
};
};
4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1051, 2548}}";
- sepNavSelRange = "{3101, 0}";
- sepNavVisRange = "{4161, 868}";
+ sepNavIntBoundsRect = "{{0, 0}, {936, 2842}}";
+ sepNavSelRange = "{3733, 0}";
+ sepNavVisRange = "{3155, 1054}";
};
};
4542E6C510305E2600C13320 /* PBXTextBookmark */ = {
@@ -259,7 +263,7 @@
fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
name = "zeroconf.browser.cpp: 90";
rLen = 0;
- rLoc = 3564;
+ rLoc = 4427;
rType = 0;
vrLen = 826;
vrLoc = 1404;
@@ -284,16 +288,6 @@
vrLen = 1308;
vrLoc = 0;
};
- 45CC33E71030D0B20057043E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
- name = "NetServiceBrowser.h: 98";
- rLen = 0;
- rLoc = 4939;
- rType = 0;
- vrLen = 2881;
- vrLoc = 2346;
- };
45CC33EA1030D0B20057043E /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
@@ -304,16 +298,6 @@
vrLen = 1685;
vrLoc = 3507;
};
- 45CC33EB1030D0B20057043E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
- name = "zeroconf.browser.cpp: 156";
- rLen = 0;
- rLoc = 4469;
- rType = 0;
- vrLen = 1215;
- vrLoc = 612;
- };
45CC33EC1030D0B20057043E /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */;
@@ -324,114 +308,188 @@
vrLen = 1102;
vrLoc = 3844;
};
- 45CC33ED1030D0B20057043E /* PBXTextBookmark */ = {
+ 45EB41AE1030755300AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64B10304E8400C13320 /* CriticalSection.cpp */;
+ name = "CriticalSection.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 705;
+ vrLoc = 0;
+ };
+ 45EB41B21030755300AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64B10304E8400C13320 /* CriticalSection.cpp */;
+ name = "CriticalSection.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 705;
+ vrLoc = 0;
+ };
+ 45EB42ED10315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
name = "NetServiceBrowser.h: 98";
rLen = 0;
rLoc = 4939;
rType = 0;
- vrLen = 1720;
- vrLoc = 3507;
+ vrLen = 1910;
+ vrLoc = 3304;
};
- 45CC33EE1030D0B20057043E /* PBXTextBookmark */ = {
+ 45EB42EE10315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */;
name = "NetServiceBrowser.cpp: 46";
rLen = 67;
rLoc = 1961;
rType = 0;
- vrLen = 1082;
- vrLoc = 1274;
+ vrLen = 766;
+ vrLoc = 1901;
};
- 45CC33F01030D0B20057043E /* PBXTextBookmark */ = {
+ 45EB42F010315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
- name = "zeroconf.browser.cpp: 137";
+ name = "zeroconf.browser.cpp: 83";
rLen = 0;
- rLoc = 4573;
+ rLoc = 2250;
rType = 0;
- vrLen = 1199;
- vrLoc = 3299;
+ vrLen = 878;
+ vrLoc = 1791;
};
- 45CC33F11030D0B20057043E /* PBXTextBookmark */ = {
+ 45EB42F110315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
name = "NetServiceBrowser.h: 98";
rLen = 0;
rLoc = 4939;
rType = 0;
- vrLen = 2881;
- vrLoc = 2346;
+ vrLen = 1910;
+ vrLoc = 3304;
+ };
+ 45EB42F210315FEC00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */;
+ name = "NetServiceBrowser.cpp: 46";
+ rLen = 67;
+ rLoc = 1961;
+ rType = 0;
+ vrLen = 1097;
+ vrLoc = 3964;
};
- 45CC342B1030D3930057043E /* PBXTextBookmark */ = {
+ 45EB42F310315FEC00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
+ name = "NetServiceBrowser.h: 98";
+ rLen = 0;
+ rLoc = 4939;
+ rType = 0;
+ vrLen = 1910;
+ vrLoc = 3304;
+ };
+ 45EB42F410315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
- name = "zeroconf.browser.cpp: 97";
+ name = "zeroconf.browser.cpp: 73";
rLen = 0;
- rLoc = 3297;
+ rLoc = 2249;
rType = 0;
- vrLen = 1311;
- vrLoc = 1656;
+ vrLen = 777;
+ vrLoc = 1577;
};
- 45CC34381030D5DF0057043E /* PBXTextBookmark */ = {
+ 45EB42F510315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */;
name = "NetServiceBrowser.cpp: 46";
rLen = 67;
rLoc = 1961;
rType = 0;
- vrLen = 1050;
- vrLoc = 4011;
+ vrLen = 1100;
+ vrLoc = 3960;
};
- 45CC34391030D5DF0057043E /* PBXTextBookmark */ = {
+ 45EB42F610315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
- name = "zeroconf.browser.cpp: 97";
+ fRef = 4542E6B810305AED00C13320 /* NetServiceBrowser.h */;
+ name = "NetServiceBrowser.h: 98";
rLen = 0;
- rLoc = 3297;
+ rLoc = 4939;
rType = 0;
- vrLen = 1388;
- vrLoc = 1580;
+ vrLen = 1910;
+ vrLoc = 3304;
};
- 45CC343A1030D5DF0057043E /* PBXTextBookmark */ = {
+ 45EB42F710315FEC00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6B710305AED00C13320 /* NetServiceBrowser.cpp */;
name = "NetServiceBrowser.cpp: 46";
rLen = 67;
rLoc = 1961;
rType = 0;
- vrLen = 1050;
- vrLoc = 4011;
+ vrLen = 766;
+ vrLoc = 1901;
+ };
+ 45EB43731031690B00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 45EB43741031690B00AB8A5C /* dbcuelist.c */;
+ name = "dbcuelist.c: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 710;
+ vrLoc = 2481;
};
- 45CC343B1030D5DF0057043E /* PBXTextBookmark */ = {
+ 45EB43741031690B00AB8A5C /* dbcuelist.c */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
+ name = dbcuelist.c;
+ path = "/Users/muller/projects/osctools/maxmsp externals/MaxSDK-5.0.6/examples/dbcuelist/dbcuelist.c";
+ sourceTree = "<absolute>";
+ };
+ 45EB43761031690B00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
- name = "zeroconf.browser.cpp: 85";
+ name = "zeroconf.browser.cpp: 151";
rLen = 0;
- rLoc = 3101;
+ rLoc = 4242;
rType = 0;
- vrLen = 868;
- vrLoc = 4161;
+ vrLen = 751;
+ vrLoc = 4017;
};
- 45EB41AE1030755300AB8A5C /* PBXTextBookmark */ = {
+ 45EB43771031690B00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4542E64B10304E8400C13320 /* CriticalSection.cpp */;
- name = "CriticalSection.cpp: 1";
+ fRef = 45EB43781031690B00AB8A5C /* dbcuelist.c */;
+ name = "dbcuelist.c: 1";
rLen = 0;
rLoc = 0;
rType = 0;
- vrLen = 705;
- vrLoc = 0;
+ vrLen = 710;
+ vrLoc = 2481;
};
- 45EB41B21030755300AB8A5C /* PBXTextBookmark */ = {
+ 45EB43781031690B00AB8A5C /* dbcuelist.c */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
+ name = dbcuelist.c;
+ path = "/Users/muller/projects/osctools/maxmsp externals/MaxSDK-5.0.6/examples/dbcuelist/dbcuelist.c";
+ sourceTree = "<absolute>";
+ };
+ 45EB4380103169C400AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4542E64B10304E8400C13320 /* CriticalSection.cpp */;
- name = "CriticalSection.cpp: 1";
+ fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
+ name = "zeroconf.browser.cpp: 119";
rLen = 0;
- rLoc = 0;
+ rLoc = 3733;
rType = 0;
- vrLen = 705;
- vrLoc = 0;
+ vrLen = 987;
+ vrLoc = 3346;
+ };
+ 45EB4381103169C800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E6BB10305AFC00C13320 /* zeroconf.browser.cpp */;
+ name = "zeroconf.browser.cpp: 119";
+ rLen = 0;
+ rLoc = 3733;
+ rType = 0;
+ vrLen = 966;
+ vrLoc = 3346;
};
}
View
132 maxmsp externals/zeroconf_browser/zeroconf.browser.xcodeproj/muller.perspectivev3
@@ -195,7 +195,26 @@
<key>Name</key>
<string>All-In-One</string>
<key>Notifications</key>
- <array/>
+ <array>
+ <dict>
+ <key>XCObserverAutoDisconnectKey</key>
+ <true/>
+ <key>XCObserverDefintionKey</key>
+ <dict/>
+ <key>XCObserverFactoryKey</key>
+ <string>XCPerspectivesSpecificationIdentifier</string>
+ <key>XCObserverGUIDKey</key>
+ <string>XCObserverProjectIdentifier</string>
+ <key>XCObserverNotificationKey</key>
+ <string>PBXStatusBuildStateMessageNotification</string>
+ <key>XCObserverTargetKey</key>
+ <string>XCMainBuildResultsModuleGUID</string>
+ <key>XCObserverTriggerKey</key>
+ <string>awakenModuleWithObserver:</string>
+ <key>XCObserverValidationKey</key>
+ <dict/>
+ </dict>
+ </array>
<key>OpenEditors</key>
<array/>
<key>PerspectiveWidths</key>
@@ -210,20 +229,21 @@
<array>
<string>XCToolbarPerspectiveControl</string>
<string>NSToolbarSeparatorItem</string>
- <string>active-combo-popup</string>
- <string>action</string>
<string>active-target-popup</string>
- <string>active-executable-popup</string>
- <string>NSToolbarFlexibleSpaceItem</string>
+ <string>active-buildstyle-popup</string>
+ <string>action</string>
+ <string>com.apple.ide.XCBreakpointsToolbarItem</string>
+ <string>servicesModuleRefactoring</string>
<string>buildOrClean</string>
- <string>build-and-go</string>
+ <string>build-and-goOrGo</string>
+ <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>get-info</string>
+ <string>clean</string>
<string>clean-target</string>
<string>go-run</string>
<string>go-debug</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
<string>toggle-editor</string>
<string>NSToolbarFlexibleSpaceItem</string>
- <string>get-info</string>
<string>com.apple.pbx.toolbar.searchfield</string>
</array>
<key>ControllerClassBaseName</key>
@@ -306,7 +326,7 @@
<real>306</real>
</array>
<key>RubberWindowFrame</key>
- <string>92 359 1440 819 0 0 1920 1178 </string>
+ <string>0 59 1440 819 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -317,8 +337,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -336,14 +354,15 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>45CC343B1030D5DF0057043E</string>
+ <string>45EB4381103169C800AB8A5C</string>
<key>history</key>
<array>
<string>45EB41AE1030755300AB8A5C</string>
<string>45CC337B1030B9060057043E</string>
- <string>45CC33E71030D0B20057043E</string>
- <string>45CC34381030D5DF0057043E</string>
- <string>45CC34391030D5DF0057043E</string>
+ <string>45EB42ED10315FEC00AB8A5C</string>
+ <string>45EB42EE10315FEC00AB8A5C</string>
+ <string>45EB43731031690B00AB8A5C</string>
+ <string>45EB4380103169C400AB8A5C</string>
</array>
<key>prevStack</key>
<array>
@@ -351,14 +370,17 @@
<string>45EB41B21030755300AB8A5C</string>
<string>45CC337D1030B9060057043E</string>
<string>45CC33EA1030D0B20057043E</string>
- <string>45CC33EB1030D0B20057043E</string>
<string>45CC33EC1030D0B20057043E</string>
- <string>45CC33ED1030D0B20057043E</string>
- <string>45CC33EE1030D0B20057043E</string>
- <string>45CC33F01030D0B20057043E</string>
- <string>45CC33F11030D0B20057043E</string>
- <string>45CC342B1030D3930057043E</string>
- <string>45CC343A1030D5DF0057043E</string>
+ <string>45EB42F010315FEC00AB8A5C</string>
+ <string>45EB42F110315FEC00AB8A5C</string>
+ <string>45EB42F210315FEC00AB8A5C</string>
+ <string>45EB42F310315FEC00AB8A5C</string>
+ <string>45EB42F410315FEC00AB8A5C</string>
+ <string>45EB42F510315FEC00AB8A5C</string>
+ <string>45EB42F610315FEC00AB8A5C</string>
+ <string>45EB42F710315FEC00AB8A5C</string>
+ <string>45EB43761031690B00AB8A5C</string>
+ <string>45EB43771031690B00AB8A5C</string>
</array>
</dict>
<key>SplitCount</key>
@@ -374,7 +396,7 @@
<key>Frame</key>
<string>{{0, 0}, {1112, 541}}</string>
<key>RubberWindowFrame</key>
- <string>92 359 1440 819 0 0 1920 1178 </string>
+ <string>0 59 1440 819 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -397,9 +419,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {1112, 205}}</string>
- <key>RubberWindowFrame</key>
- <string>92 359 1440 819 0 0 1920 1178 </string>
+ <string>{{10, 27}, {0, -27}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -439,6 +459,8 @@
<string>PBXCVSModule</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -448,12 +470,14 @@
<key>XCBuildResultsTrigger_Collapse</key>
<integer>1021</integer>
<key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
+ <integer>1010</integer>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {1112, 173}}</string>
+ <string>{{10, 27}, {1112, 205}}</string>
+ <key>RubberWindowFrame</key>
+ <string>0 59 1440 819 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -481,11 +505,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>45CC33F41030D0B20057043E</string>
+ <string>45EB43001031603C00AB8A5C</string>
<string>1CA23ED40692098700951B8B</string>
- <string>45CC33F51030D0B20057043E</string>
+ <string>45EB43011031603C00AB8A5C</string>
<string>4542E60A10304A7500C13320</string>
- <string>45CC33F61030D0B20057043E</string>
+ <string>45EB43021031603C00AB8A5C</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -499,19 +523,19 @@
<array>
<string>XCToolbarPerspectiveControl</string>
<string>NSToolbarSeparatorItem</string>
- <string>active-combo-popup</string>
- <string>NSToolbarFlexibleSpaceItem</string>
<string>build-and-go</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>go</string>
+ <string>go-debug</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>active-executable-popup</string>
+ <string>debugger-fix-and-continue</string>
<string>debugger-restart-executable</string>
<string>debugger-pause</string>
<string>debugger-step-over</string>
<string>debugger-step-into</string>
<string>debugger-step-out</string>
- <string>debugger-enable-breakpoints</string>
+ <string>debugger-step-instruction</string>
<string>NSToolbarFlexibleSpaceItem</string>
- <string>com.apple.ide.XCBreakpointsToolbarItem</string>
- <string>clear-log</string>
</array>
<key>ControllerClassBaseName</key>
<string>PBXDebugSessionModule</string>
@@ -558,8 +582,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {726, 386}}</string>
- <string>{{726, 0}, {714, 386}}</string>
+ <string>{{0, 0}, {720, 281}}</string>
+ <string>{{0, 281}, {720, 282}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -574,8 +598,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {1440, 386}}</string>
- <string>{{0, 386}, {1440, 177}}</string>
+ <string>{{0, 0}, {720, 563}}</string>
+ <string>{{720, 0}, {720, 563}}</string>
</array>
</dict>
</dict>
@@ -601,14 +625,14 @@
<key>DebugVariablesTableConfiguration</key>
<array>
<string>Name</string>
- <real>120</real>
+ <real>178</real>
<string>Value</string>
<real>85</real>
<string>Summary</string>
- <real>484</real>
+ <real>432</real>
</array>
<key>Frame</key>
- <string>{{726, 0}, {714, 386}}</string>
+ <string>{{0, 281}, {720, 282}}</string>
</dict>
</dict>
<key>Module</key>
@@ -632,14 +656,14 @@
</array>
<key>TableOfContents</key>
<array>
- <string>45CC33FD1030D11C0057043E</string>
+ <string>45EB43031031603C00AB8A5C</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
- <string>45CC33FE1030D11C0057043E</string>
- <string>45CC33FF1030D11C0057043E</string>
- <string>45CC34001030D11C0057043E</string>
- <string>45CC34011030D11C0057043E</string>
- <string>4542E60A10304A7500C13320</string>
+ <string>45EB43041031603C00AB8A5C</string>
+ <string>45EB43051031603C00AB8A5C</string>
+ <string>45EB43061031603C00AB8A5C</string>
+ <string>45EB43071031603C00AB8A5C</string>
+ <string>45EB43081031603C00AB8A5C</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -654,7 +678,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>0.0</real>
+ <real>271673800.18725502</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -669,12 +693,12 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>45CC34031030D11C0057043E</string>
- <string>45CC34041030D11C0057043E</string>
+ <string>45EB430E103160C800AB8A5C</string>
+ <string>45EB430F103160C800AB8A5C</string>
<string>/Users/muller/projects/osctools/maxmsp externals/zeroconf_browser/zeroconf.browser.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>92 359 1440 819 0 0 1920 1178 </string>
+ <string>0 59 1440 819 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
View
90 maxmsp externals/zeroconf_resolve/zeroconf.resolve.cpp
@@ -8,23 +8,29 @@
using namespace ZeroConf;
-class ServiceListener;
+class Service;
struct zeroconf_resolve
{
t_object ob; // the object itself (must be first)
+ t_symbol *name;
+ t_symbol *type;
+ t_symbol *domain;
void *out;
- NetService *mpNetService;
- ServiceListener *mpServiceListener;
+ Service *mpService;
};
-class ServiceListener : public ZeroConf::NetServiceListener
+class Service : public NetService, NetServiceListener
{
zeroconf_resolve *mpExternal;
public:
- ServiceListener(zeroconf_resolve *x)
- : mpExternal(x)
+ Service(const std::string &domain,
+ const std::string &type,
+ const std::string &name,
+ zeroconf_resolve *x)
+ : NetService(domain, type, name)
+ , mpExternal(x)
{
}
@@ -51,22 +57,18 @@ class ServiceListener : public ZeroConf::NetServiceListener
};
//------------------------------------------------------------------------------
-void *zeroconf_resolve_new(t_symbol *s, long argc, t_atom *argv);
-void zeroconf_resolve_free(zeroconf_resolve *x);
-void zeroconf_resolve_assist(zeroconf_resolve *x, void *b, long m, long a, char *s);
-
t_class *zeroconf_resolve_class;
-int main(void)
-{
- t_class *c = class_new("zeroconf.resolve", (method)zeroconf_resolve_new, (method)zeroconf_resolve_free, (long)sizeof(zeroconf_resolve), 0L, A_GIMME, 0);
-
- class_addmethod(c, (method)zeroconf_resolve_assist, "assist", A_CANT, 0);
-
- class_register(CLASS_BOX, c); /* CLASS_NOBOX */
- zeroconf_resolve_class = c;
+void zeroconf_resolve_bang(zeroconf_resolve *x)
+{
+ if(x->mpService)
+ delete x->mpService;
- return 0;
+ x->mpService = new Service(x->domain->s_name,
+ x->type->s_name,
+ x->name->s_name,
+ x);
+ x->mpService->resolveWithTimeout(10.0);
}
void zeroconf_resolve_assist(zeroconf_resolve *x, void *b, long m, long a, char *s)
@@ -83,15 +85,9 @@ void zeroconf_resolve_assist(zeroconf_resolve *x, void *b, long m, long a, char
void zeroconf_resolve_free(zeroconf_resolve *x)
{
- if(x->mpNetService)
+ if(x->mpService)
{
- delete x->mpNetService;
- x->mpNetService = NULL;
- }
- if(x->mpServiceListener)
- {
- delete x->mpServiceListener;
- x->mpServiceListener = NULL;
+ delete x->mpService;
}
}
@@ -101,24 +97,30 @@ void *zeroconf_resolve_new(t_symbol *s, long argc, t_atom *argv)
if (x = (zeroconf_resolve *)object_alloc(zeroconf_resolve_class))
{
+ x->mpService = NULL;
+ x->name = gensym("");
+ x->type = gensym("");
+ x->domain = gensym("local.");
x->out = outlet_new(x, NULL);
-
- x->mpNetService = NULL;
- x->mpServiceListener = NULL;
- if(argc == 3 && argv[0].a_type == A_SYM && argv[1].a_type == A_SYM && argv[2].a_type == A_SYM)
- {
- const char *name = atom_getsym(argv+0)->s_name;
- const char *type = atom_getsym(argv+1)->s_name;
- const char *domain = atom_getsym(argv+2)->s_name;
- x->mpNetService = new NetService(domain, type, name);
- x->mpServiceListener = new ServiceListener(x);
- x->mpNetService->setListener(x->mpServiceListener);
- x->mpNetService->resolveWithTimeout(10.0);
- }
- else
- {
- object_post((t_object *)x, "error");
- }
+ attr_args_process(x, argc, argv);
}
return (x);
}
+
+int main(void)
+{
+ t_class *c = class_new("zeroconf.resolve", (method)zeroconf_resolve_new, (method)zeroconf_resolve_free, (long)sizeof(zeroconf_resolve), 0L, A_GIMME, 0);
+
+ class_addmethod(c, (method)zeroconf_resolve_bang, "bang", 0);
+ class_addmethod(c, (method)zeroconf_resolve_bang, "loadbang", 0);
+ class_addmethod(c, (method)zeroconf_resolve_assist, "assist", A_CANT, 0);
+
+ CLASS_ATTR_SYM(c, "name", 0, zeroconf_resolve, name);
+ CLASS_ATTR_SYM(c, "type", 0, zeroconf_resolve, type);
+ CLASS_ATTR_SYM(c, "domain", 0, zeroconf_resolve, domain);
+
+ class_register(CLASS_BOX, c); /* CLASS_NOBOX */
+ zeroconf_resolve_class = c;
+
+ return 0;
+}
View
2 maxmsp externals/zeroconf_resolve/zeroconf.resolve.maxhelp
@@ -31,7 +31,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.resolve AnotherOne _osc._udp local.",
+ "text" : "zeroconf.resolve @name \"Un autre service\" @type _osc._udp @domain local.",
"fontname" : "Verdana",
"id" : "obj-1",
"numinlets" : 1,
View
106 maxmsp externals/zeroconf_resolve/zeroconf.resolve.xcodeproj/muller.pbxuser
@@ -34,7 +34,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 1353,
+ 10,
20,
48,
43,
@@ -73,14 +73,20 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 271636027;
- PBXWorkspaceStateSaveDate = 271636027;
+ PBXPerProjectTemplateStateSaveDate = 271675035;
+ PBXWorkspaceStateSaveDate = 271675035;
};
perUserProjectItems = {
- 4542E62910304C4200C13320 /* PBXTextBookmark */ = 4542E62910304C4200C13320 /* PBXTextBookmark */;
- 4542E62B10304C4200C13320 /* PBXTextBookmark */ = 4542E62B10304C4200C13320 /* PBXTextBookmark */;
- 45CC33B51030C1DD0057043E /* PBXTextBookmark */ = 45CC33B51030C1DD0057043E /* PBXTextBookmark */;
- 45CC34591030D64C0057043E /* PBXTextBookmark */ = 45CC34591030D64C0057043E /* PBXTextBookmark */;
+ 4542E62910304C4200C13320 = 4542E62910304C4200C13320 /* PBXTextBookmark */;
+ 4542E62B10304C4200C13320 = 4542E62B10304C4200C13320 /* PBXTextBookmark */;
+ 45EB42B91031587100AB8A5C = 45EB42B91031587100AB8A5C /* PBXTextBookmark */;
+ 45EB42BA1031587A00AB8A5C = 45EB42BA1031587A00AB8A5C /* PBXTextBookmark */;
+ 45EB43C31031703E00AB8A5C /* PBXTextBookmark */ = 45EB43C31031703E00AB8A5C /* PBXTextBookmark */;
+ 45EB43C41031703E00AB8A5C /* PBXTextBookmark */ = 45EB43C41031703E00AB8A5C /* PBXTextBookmark */;
+ 45EB43C51031703E00AB8A5C /* PBXTextBookmark */ = 45EB43C51031703E00AB8A5C /* PBXTextBookmark */;
+ 45EB43C61031703E00AB8A5C /* PBXTextBookmark */ = 45EB43C61031703E00AB8A5C /* PBXTextBookmark */;
+ 45EB43C71031703E00AB8A5C /* PBXTextBookmark */ = 45EB43C71031703E00AB8A5C /* PBXTextBookmark */;
+ 45EB43C81031704500AB8A5C /* PBXTextBookmark */ = 45EB43C81031704500AB8A5C /* PBXTextBookmark */;
};
sourceControlManager = 4542E5F8103049ED00C13320 /* Source Control */;
userBuildSettings = {
@@ -137,9 +143,9 @@
};
4542E64810304E8400C13320 /* NetService.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1230, 2114}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{441, 1041}";
+ sepNavIntBoundsRect = "{{0, 0}, {1230, 2016}}";
+ sepNavSelRange = "{5662, 75}";
+ sepNavVisRange = "{4639, 1716}";
};
};
4542E64910304E8400C13320 /* NetService.cpp */ = {
@@ -232,29 +238,89 @@
};
45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1531, 1750}}";
- sepNavSelRange = "{1045, 0}";
- sepNavVisRange = "{1985, 1304}";
+ sepNavIntBoundsRect = "{{0, 0}, {936, 1778}}";
+ sepNavSelRange = "{2502, 0}";
+ sepNavVisRange = "{2168, 942}";
};
};
- 45CC33B51030C1DD0057043E /* PBXTextBookmark */ = {
+ 45EB42B91031587100AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
name = "zeroconf.resolve.cpp: 44";
rLen = 0;
- rLoc = 1045;
+ rLoc = 1203;
rType = 0;
- vrLen = 1600;
- vrLoc = 0;
+ vrLen = 932;
+ vrLoc = 1985;
};
- 45CC34591030D64C0057043E /* PBXTextBookmark */ = {
+ 45EB42BA1031587A00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
name = "zeroconf.resolve.cpp: 44";
rLen = 0;
- rLoc = 1045;
+ rLoc = 1203;
rType = 0;
- vrLen = 1304;
+ vrLen = 932;
vrLoc = 1985;
};
+ 45EB43C31031703E00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 108";
+ rLen = 75;
+ rLoc = 5662;
+ rType = 0;
+ vrLen = 1716;
+ vrLoc = 4639;
+ };
+ 45EB43C41031703E00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
+ name = "zeroconf.resolve.cpp: 29";
+ rLen = 0;
+ rLoc = 574;
+ rType = 0;
+ vrLen = 919;
+ vrLoc = 0;
+ };
+ 45EB43C51031703E00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
+ name = "zeroconf.resolve.cpp: 29";
+ rLen = 0;
+ rLoc = 574;
+ rType = 0;
+ vrLen = 919;
+ vrLoc = 0;
+ };
+ 45EB43C61031703E00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 108";
+ rLen = 75;
+ rLoc = 5662;
+ rType = 0;
+ vrLen = 1716;
+ vrLoc = 4639;
+ };
+ 45EB43C71031703E00AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
+ name = "zeroconf.resolve.cpp: 103";
+ rLen = 0;
+ rLoc = 2502;
+ rType = 0;
+ vrLen = 600;
+ vrLoc = 2170;
+ };
+ 45EB43C81031704500AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 45CC33AF1030C0D40057043E /* zeroconf.resolve.cpp */;
+ name = "zeroconf.resolve.cpp: 103";
+ rLen = 0;
+ rLoc = 2502;
+ rType = 0;
+ vrLen = 942;
+ vrLoc = 2168;
+ };
}
View
99 maxmsp externals/zeroconf_resolve/zeroconf.resolve.xcodeproj/muller.perspectivev3
@@ -195,13 +195,32 @@
<key>Name</key>
<string>All-In-One</string>
<key>Notifications</key>
- <array/>
+ <array>
+ <dict>
+ <key>XCObserverAutoDisconnectKey</key>
+ <true/>
+ <key>XCObserverDefintionKey</key>
+ <dict/>
+ <key>XCObserverFactoryKey</key>
+ <string>XCPerspectivesSpecificationIdentifier</string>
+ <key>XCObserverGUIDKey</key>
+ <string>XCObserverProjectIdentifier</string>
+ <key>XCObserverNotificationKey</key>
+ <string>PBXStatusBuildStateMessageNotification</string>
+ <key>XCObserverTargetKey</key>
+ <string>XCMainBuildResultsModuleGUID</string>
+ <key>XCObserverTriggerKey</key>
+ <string>awakenModuleWithObserver:</string>
+ <key>XCObserverValidationKey</key>
+ <dict/>
+ </dict>
+ </array>
<key>OpenEditors</key>
<array/>
<key>PerspectiveWidths</key>
<array>
- <integer>1440</integer>
- <integer>1440</integer>
+ <integer>874</integer>
+ <integer>874</integer>
</array>
<key>Perspectives</key>
<array>
@@ -210,20 +229,21 @@
<array>
<string>XCToolbarPerspectiveControl</string>
<string>NSToolbarSeparatorItem</string>
- <string>active-combo-popup</string>
- <string>action</string>
<string>active-target-popup</string>
- <string>active-executable-popup</string>
- <string>NSToolbarFlexibleSpaceItem</string>
+ <string>active-buildstyle-popup</string>
+ <string>action</string>
+ <string>com.apple.ide.XCBreakpointsToolbarItem</string>
+ <string>servicesModuleRefactoring</string>
<string>buildOrClean</string>
- <string>build-and-go</string>
+ <string>build-and-goOrGo</string>
+ <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>get-info</string>
+ <string>clean</string>
<string>clean-target</string>
<string>go-run</string>
<string>go-debug</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
<string>toggle-editor</string>
<string>NSToolbarFlexibleSpaceItem</string>
- <string>get-info</string>
<string>com.apple.pbx.toolbar.searchfield</string>
</array>
<key>ControllerClassBaseName</key>
@@ -289,7 +309,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {306, 990}}</string>
+ <string>{{0, 0}, {306, 632}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -299,14 +319,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {323, 1008}}</string>
+ <string>{{0, 0}, {323, 650}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>306</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 187 1097 691 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -317,8 +337,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -336,15 +354,18 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>45CC34591030D64C0057043E</string>
+ <string>45EB43C81031704500AB8A5C</string>
<key>history</key>
<array>
<string>4542E62910304C4200C13320</string>
- <string>45CC33B51030C1DD0057043E</string>
+ <string>45EB43C31031703E00AB8A5C</string>
+ <string>45EB43C71031703E00AB8A5C</string>
</array>
<key>prevStack</key>
<array>
<string>4542E62B10304C4200C13320</string>
+ <string>45EB43C51031703E00AB8A5C</string>
+ <string>45EB43C61031703E00AB8A5C</string>
</array>
</dict>
<key>SplitCount</key>
@@ -358,18 +379,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1592, 803}}</string>
+ <string>{{0, 0}, {769, 491}}</string>
<key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 187 1097 691 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>803pt</string>
+ <string>491pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>200pt</string>
+ <string>154pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -383,9 +404,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {1592, 173}}</string>
- <key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>{{10, 27}, {0, -27}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -425,6 +444,8 @@
<string>PBXCVSModule</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -434,12 +455,14 @@
<key>XCBuildResultsTrigger_Collapse</key>
<integer>1021</integer>
<key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
+ <integer>1010</integer>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {1592, 173}}</string>
+ <string>{{10, 27}, {769, 127}}</string>
+ <key>RubberWindowFrame</key>
+ <string>50 187 1097 691 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -448,7 +471,7 @@
</dict>
</array>
<key>Proportion</key>
- <string>1592pt</string>
+ <string>769pt</string>
</dict>
</array>
<key>Name</key>
@@ -467,11 +490,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>45CC345A1030D64C0057043E</string>
+ <string>45EB43C91031704500AB8A5C</string>
<string>1CA23ED40692098700951B8B</string>
- <string>45CC345B1030D64C0057043E</string>
+ <string>45EB43CA1031704500AB8A5C</string>
<string>4542E60A10304A7500C13320</string>
- <string>45CC345C1030D64C0057043E</string>
+ <string>45EB43CB1031704500AB8A5C</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -618,14 +641,14 @@
</array>
<key>TableOfContents</key>
<array>
- <string>4542E6721030500E00C13320</string>
+ <string>45EB43CC1031704500AB8A5C</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
- <string>4542E6731030500E00C13320</string>
- <string>4542E6741030500E00C13320</string>
- <string>4542E6751030500E00C13320</string>
- <string>4542E6761030500E00C13320</string>
- <string>4542E60A10304A7500C13320</string>
+ <string>45EB43CD1031704500AB8A5C</string>
+ <string>45EB43CE1031704500AB8A5C</string>
+ <string>45EB43CF1031704500AB8A5C</string>
+ <string>45EB43D01031704500AB8A5C</string>
+ <string>45EB43D11031704500AB8A5C</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -640,7 +663,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>0.0</real>
+ <real>271675461.02016699</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -658,7 +681,7 @@
<string>/Users/muller/projects/osctools/maxmsp externals/zeroconf_resolve/zeroconf.resolve.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 187 1097 691 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
View
140 maxmsp externals/zeroconf_service/zeroconf.service.cpp
@@ -8,69 +8,65 @@
using namespace ZeroConf;
-class ServiceListener;
+class Service;
struct zeroconf_service
{
- t_object ob; // the object itself (must be first)
- NetService *mpNetService;
- ServiceListener *mpServiceListener;
+ t_object ob; // the object itself (must be first)
+ t_symbol *name;
+ t_symbol *type;
+ t_symbol *domain;
+ long port;
+ Service *mpService;
};
-class ServiceListener : public ZeroConf::NetServiceListener
+class Service : public NetService, public NetServiceListener
{
- zeroconf_service *mpZeroconf_service;
+ zeroconf_service *mpExternal;
public:
- ServiceListener(zeroconf_service *x)
- : mpZeroconf_service(x)
+ Service(const std::string &domain,
+ const std::string &type,
+ const std::string &name,
+ const int port,
+ zeroconf_service *x)
+ : NetService(domain, type, name, port)
+ , mpExternal(x)
{
+ setListener(this);
}
- virtual void willPublish(NetService *pNetService)
- {
- }
- virtual void didNotPublish(NetService *pNetService)
- {
- object_post((t_object *)mpZeroconf_service, "didNotPublish" );
- }
+private:
+ virtual void willPublish(NetService *pNetService) {}
+ virtual void didNotPublish(NetService *pNetService) { object_post((t_object *)mpExternal, "didNotPublish" ); }
virtual void didPublish(NetService *pNetService)
{
- object_post((t_object *)mpZeroconf_service, "Service published: %s %d", pNetService->getName().c_str(), pNetService->getPort());
- }
- virtual void willResolve(NetService *pNetService)
- {
- }
- virtual void didNotResolve(NetService *NetService)
- {
- }
- virtual void didResolveAddress(NetService *pNetService)
- {
- }
- virtual void didUpdateTXTRecordData(NetService *pNetService)
- {
- }
- virtual void didStop(NetService *pNetService)
- {
+ object_post((t_object *)mpExternal, "Service published: %s %d", pNetService->getName().c_str(), pNetService->getPort());
}
+
+ virtual void willResolve(NetService *pNetService) {}
+ virtual void didNotResolve(NetService *NetService) {}
+ virtual void didResolveAddress(NetService *pNetService) {}
+ virtual void didUpdateTXTRecordData(NetService *pNetService) {}
+ virtual void didStop(NetService *pNetService) {}
};
//------------------------------------------------------------------------------
-void *zeroconf_service_new(t_symbol *s, long argc, t_atom *argv);
-void zeroconf_service_free(zeroconf_service *x);
-void zeroconf_service_assist(zeroconf_service *x, void *b, long m, long a, char *s);
-
t_class *zeroconf_service_class;
-int main(void)
-{
- t_class *c = class_new("zeroconf.service", (method)zeroconf_service_new, (method)zeroconf_service_free, (long)sizeof(zeroconf_service), 0L, A_GIMME, 0);
-
- class_addmethod(c, (method)zeroconf_service_assist, "assist", A_CANT, 0);
-
- class_register(CLASS_BOX, c); /* CLASS_NOBOX */
- zeroconf_service_class = c;
-
- return 0;
+void zeroconf_service_bang(zeroconf_service *x)
+{
+ if(x->mpService)
+ {
+ delete x->mpService;
+ x->mpService = NULL;
+ }
+
+ x->mpService = new Service(x->domain->s_name,
+ x->type->s_name,
+ x->name->s_name,
+ x->port,
+ x);
+ x->mpService->publish();
}
void zeroconf_service_assist(zeroconf_service *x, void *b, long m, long a, char *s)
@@ -87,15 +83,9 @@ void zeroconf_service_assist(zeroconf_service *x, void *b, long m, long a, char
void zeroconf_service_free(zeroconf_service *x)
{
- if(x->mpNetService)
+ if(x->mpService)
{
- delete x->mpNetService;
- x->mpNetService = NULL;
- }
- if(x->mpServiceListener)
- {
- delete x->mpServiceListener;
- x->mpServiceListener = NULL;
+ delete x->mpService;
}
}
@@ -105,23 +95,31 @@ void *zeroconf_service_new(t_symbol *s, long argc, t_atom *argv)
if (x = (zeroconf_service *)object_alloc(zeroconf_service_class))
{
- x->mpNetService = NULL;
- x->mpServiceListener = NULL;
- if(argc >= 3 && argv[0].a_type == A_SYM && argv[1].a_type == A_LONG && argv[2].a_type == A_SYM)
- {
- const char *name = atom_getsym(argv+0)->s_name;
- const long port = atom_getlong(argv+1);
- const char *type = atom_getsym(argv+2)->s_name;
- const char *domain = "local."; //atom_getsym(argv+0)->s_name;
- x->mpNetService = new NetService(domain, type, name, port);
- x->mpServiceListener = new ServiceListener(x);
- x->mpNetService->setListener(x->mpServiceListener);
- x->mpNetService->publish();
- }
- else
- {
- object_post((t_object *)x, "error");
- }
- }
+ x->mpService = NULL;
+ x->name = gensym("");
+ x->type = gensym("");
+ x->domain = gensym("");
+ x->port = 0;
+ attr_args_process(x, argc, argv);
+ }
return (x);
}
+
+int main(void)
+{
+ t_class *c = class_new("zeroconf.service", (method)zeroconf_service_new, (method)zeroconf_service_free, (long)sizeof(zeroconf_service), 0L, A_GIMME, 0);
+
+ class_addmethod(c, (method)zeroconf_service_bang, "bang", 0);
+ class_addmethod(c, (method)zeroconf_service_bang, "loadbang", 0);
+ class_addmethod(c, (method)zeroconf_service_assist, "assist", A_CANT, 0);
+
+ CLASS_ATTR_SYM(c, "name", 0, zeroconf_service, name);
+ CLASS_ATTR_SYM(c, "type", 0, zeroconf_service, type);
+ CLASS_ATTR_SYM(c, "domain", 0, zeroconf_service, domain);
+ CLASS_ATTR_LONG(c, "port", 0, zeroconf_service, port);
+
+ class_register(CLASS_BOX, c); /* CLASS_NOBOX */
+ zeroconf_service_class = c;
+
+ return 0;
+}
View
4 maxmsp externals/zeroconf_service/zeroconf.service.maxhelp
@@ -18,7 +18,7 @@
"boxes" : [ {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.service \"Un autre service\" 6666 _osc._udp",
+ "text" : "zeroconf.service @name \"Un autre service\" @port 6666 @type _osc._udp",
"id" : "obj-6",
"fontname" : "Verdana",
"numinlets" : 1,
@@ -44,7 +44,7 @@
, {
"box" : {
"maxclass" : "newobj",
- "text" : "zeroconf.service \"Open Sound Control UDP Service\" 12345 _osc._udp",
+ "text" : "zeroconf.service @name \"Open Sound Control UDP Service\" @port 12345 @type _osc._udp",
"id" : "obj-1",
"fontname" : "Verdana",
"numinlets" : 1,
View
200 maxmsp externals/zeroconf_service/zeroconf.service.xcodeproj/muller.pbxuser
@@ -10,7 +10,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 1474,
+ 138,
20,
48,
43,
@@ -27,12 +27,26 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 271635939;
- PBXWorkspaceStateSaveDate = 271635939;
+ PBXPerProjectTemplateStateSaveDate = 271673812;
+ PBXWorkspaceStateSaveDate = 271673812;
};
perUserProjectItems = {
- 45CC34451030D5F90057043E /* PBXTextBookmark */ = 45CC34451030D5F90057043E /* PBXTextBookmark */;
- 45CC34461030D5F90057043E /* PBXTextBookmark */ = 45CC34461030D5F90057043E /* PBXTextBookmark */;
+ 45EB42D21031588F00AB8A5C = 45EB42D21031588F00AB8A5C /* PBXTextBookmark */;
+ 45EB42D31031589400AB8A5C = 45EB42D31031589400AB8A5C /* PBXTextBookmark */;
+ 45EB439E10316D6800AB8A5C /* PBXTextBookmark */ = 45EB439E10316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB439F10316D6800AB8A5C /* PBXTextBookmark */ = 45EB439F10316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A010316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A010316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A110316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A110316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A210316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A210316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A310316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A310316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A410316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A410316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A510316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A510316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A610316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A610316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A710316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A710316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A810316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A810316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43A910316D6800AB8A5C /* PBXTextBookmark */ = 45EB43A910316D6800AB8A5C /* PBXTextBookmark */;
+ 45EB43AB10316D7900AB8A5C /* PBXTextBookmark */ = 45EB43AB10316D7900AB8A5C /* PBXTextBookmark */;
+ 45EB43AC10316D7900AB8A5C /* PBXTextBookmark */ = 45EB43AC10316D7900AB8A5C /* PBXTextBookmark */;
};
sourceControlManager = 45CC33C31030C4090057043E /* Source Control */;
userBuildSettings = {
@@ -40,14 +54,28 @@
};
22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1652, 1792}}";
- sepNavSelRange = "{2836, 0}";
- sepNavVisRange = "{1352, 1825}";
+ sepNavIntBoundsRect = "{{0, 0}, {756, 1848}}";
+ sepNavSelRange = "{1644, 0}";
+ sepNavVisRange = "{1517, 532}";
};
};
2FBBEAD608F335360078DB84 /* max-external */ = {
activeExec = 0;
};
+ 4542E64810304E8400C13320 /* NetService.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1230, 1946}}";
+ sepNavSelRange = "{5882, 7}";
+ sepNavVisRange = "{5765, 722}";
+ };
+ };
+ 4542E64910304E8400C13320 /* NetService.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {519, 3836}}";
+ sepNavSelRange = "{0, 0}";
+ sepNavVisRange = "{0, 1274}";
+ };
+ };
45CC33C31030C4090057043E /* Source Control */ = {
isa = PBXSourceControlManager;
fallbackIsa = XCSourceControlManager;
@@ -59,24 +87,162 @@
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
- 45CC34451030D5F90057043E /* PBXTextBookmark */ = {
+ 45EB42D21031588F00AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
- name = "zeroconf.service.cpp: 114";
+ name = "zeroconf.service.cpp: 115";
rLen = 0;
- rLoc = 2795;
+ rLoc = 2491;
rType = 0;
- vrLen = 1890;
- vrLoc = 1286;
+ vrLen = 840;
+ vrLoc = 1874;
};
- 45CC34461030D5F90057043E /* PBXTextBookmark */ = {
+ 45EB42D31031589400AB8A5C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
name = "zeroconf.service.cpp: 115";
rLen = 0;
- rLoc = 2836;
+ rLoc = 2491;
+ rType = 0;
+ vrLen = 840;
+ vrLoc = 1874;
+ };
+ 45EB439E10316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64910304E8400C13320 /* NetService.cpp */;
+ name = "NetService.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1274;
+ vrLoc = 0;
+ };
+ 45EB439F10316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 114";
+ rLen = 7;
+ rLoc = 5882;
+ rType = 0;
+ vrLen = 722;
+ vrLoc = 5765;
+ };
+ 45EB43A010316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 36";
+ rLen = 0;
+ rLoc = 687;
+ rType = 0;
+ vrLen = 565;
+ vrLoc = 190;
+ };
+ 45EB43A110316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 25";
+ rLen = 0;
+ rLoc = 392;
+ rType = 0;
+ vrLen = 454;
+ vrLoc = 4;
+ };
+ 45EB43A210316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1215;
+ vrLoc = 4964;
+ };
+ 45EB43A310316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64910304E8400C13320 /* NetService.cpp */;
+ name = "NetService.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1274;
+ vrLoc = 0;
+ };
+ 45EB43A410316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 110";
+ rLen = 0;
+ rLoc = 5767;
+ rType = 0;
+ vrLen = 2026;
+ vrLoc = 2021;
+ };
+ 45EB43A510316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 28";
+ rLen = 0;
+ rLoc = 580;
+ rType = 0;
+ vrLen = 477;
+ vrLoc = 243;
+ };
+ 45EB43A610316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 97";
+ rLen = 91;
+ rLoc = 4867;
+ rType = 0;
+ vrLen = 1232;
+ vrLoc = 4536;
+ };
+ 45EB43A710316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 36";
+ rLen = 0;
+ rLoc = 687;
+ rType = 0;
+ vrLen = 567;
+ vrLoc = 188;
+ };
+ 45EB43A810316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4542E64810304E8400C13320 /* NetService.h */;
+ name = "NetService.h: 114";
+ rLen = 7;
+ rLoc = 5882;
+ rType = 0;
+ vrLen = 722;
+ vrLoc = 5765;
+ };
+ 45EB43A910316D6800AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 69";
+ rLen = 0;
+ rLoc = 1835;
+ rType = 0;
+ vrLen = 531;
+ vrLoc = 1517;
+ };
+ 45EB43AB10316D7900AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "error: expected `)' before 'x'";
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ rLen = 1;
+ rLoc = 64;
+ rType = 1;
+ };
+ 45EB43AC10316D7900AB8A5C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 22CF11AD0EE9A8840054F513 /* zeroconf.service.cpp */;
+ name = "zeroconf.service.cpp: 64";
+ rLen = 0;
+ rLoc = 1644;
rType = 0;
- vrLen = 1825;
- vrLoc = 1352;
+ vrLen = 532;
+ vrLoc = 1517;
};
}
View
97 maxmsp externals/zeroconf_service/zeroconf.service.xcodeproj/muller.perspectivev3
@@ -195,13 +195,32 @@
<key>Name</key>
<string>All-In-One</string>
<key>Notifications</key>
- <array/>
+ <array>
+ <dict>
+ <key>XCObserverAutoDisconnectKey</key>
+ <true/>
+ <key>XCObserverDefintionKey</key>
+ <dict/>
+ <key>XCObserverFactoryKey</key>
+ <string>XCPerspectivesSpecificationIdentifier</string>
+ <key>XCObserverGUIDKey</key>
+ <string>XCObserverProjectIdentifier</string>
+ <key>XCObserverNotificationKey</key>
+ <string>PBXStatusBuildStateMessageNotification</string>
+ <key>XCObserverTargetKey</key>
+ <string>XCMainBuildResultsModuleGUID</string>
+ <key>XCObserverTriggerKey</key>
+ <string>awakenModuleWithObserver:</string>
+ <key>XCObserverValidationKey</key>
+ <dict/>
+ </dict>
+ </array>
<key>OpenEditors</key>
<array/>
<key>PerspectiveWidths</key>
<array>
- <integer>-1</integer>
- <integer>-1</integer>
+ <integer>1012</integer>
+ <integer>1012</integer>
</array>
<key>Perspectives</key>
<array>
@@ -210,20 +229,21 @@
<array>
<string>XCToolbarPerspectiveControl</string>
<string>NSToolbarSeparatorItem</string>
- <string>active-combo-popup</string>
- <string>action</string>
<string>active-target-popup</string>
- <string>active-executable-popup</string>
- <string>NSToolbarFlexibleSpaceItem</string>
+ <string>active-buildstyle-popup</string>
+ <string>action</string>
+ <string>com.apple.ide.XCBreakpointsToolbarItem</string>
+ <string>servicesModuleRefactoring</string>
<string>buildOrClean</string>
- <string>build-and-go</string>
+ <string>build-and-goOrGo</string>
+ <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>get-info</string>
+ <string>clean</string>
<string>clean-target</string>
<string>go-run</string>
<string>go-debug</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
<string>toggle-editor</string>
<string>NSToolbarFlexibleSpaceItem</string>
- <string>get-info</string>
<string>com.apple.pbx.toolbar.searchfield</string>
</array>
<key>ControllerClassBaseName</key>
@@ -285,7 +305,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {185, 990}}</string>
+ <string>{{0, 0}, {185, 597}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -295,14 +315,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {202, 1008}}</string>
+ <string>{{0, 0}, {202, 615}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>185</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 222 1012 656 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -313,8 +333,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -332,10 +350,23 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>45CC34461030D5F90057043E</string>
+ <string>45EB43AC10316D7900AB8A5C</string>
<key>history</key>
<array>
- <string>45CC34451030D5F90057043E</string>
+ <string>45EB439E10316D6800AB8A5C</string>
+ <string>45EB439F10316D6800AB8A5C</string>
+ <string>45EB43AB10316D7900AB8A5C</string>
+ </array>
+ <key>prevStack</key>
+ <array>
+ <string>45EB43A110316D6800AB8A5C</string>
+ <string>45EB43A210316D6800AB8A5C</string>
+ <string>45EB43A310316D6800AB8A5C</string>
+ <string>45EB43A410316D6800AB8A5C</string>
+ <string>45EB43A510316D6800AB8A5C</string>
+ <string>45EB43A610316D6800AB8A5C</string>
+ <string>45EB43A710316D6800AB8A5C</string>
+ <string>45EB43A810316D6800AB8A5C</string>
</array>
</dict>
<key>SplitCount</key>
@@ -349,18 +380,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1713, 1003}}</string>
+ <string>{{0, 0}, {805, 378}}</string>
<key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 222 1012 656 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>1003pt</string>
+ <string>378pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>0pt</string>
+ <string>232pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -374,9 +405,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {1713, -27}}</string>
- <key>RubberWindowFrame</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>{{10, 27}, {377, -27}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -416,6 +445,8 @@
<string>PBXCVSModule</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -425,12 +456,14 @@
<key>XCBuildResultsTrigger_Collapse</key>
<integer>1021</integer>
<key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
+ <integer>1010</integer>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 31}, {603, 297}}</string>
+ <string>{{10, 27}, {805, 205}}</string>
+ <key>RubberWindowFrame</key>
+ <string>50 222 1012 656 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -439,7 +472,7 @@
</dict>
</array>
<key>Proportion</key>
- <string>1713pt</string>
+ <string>805pt</string>
</dict>
</array>
<key>Name</key>
@@ -458,11 +491,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>45CC34471030D5F90057043E</string>
+ <string>45EB43AD10316D7900AB8A5C</string>
<string>1CA23ED40692098700951B8B</string>
- <string>45CC34481030D5F90057043E</string>
+ <string>45EB43AE10316D7900AB8A5C</string>
<string>45CC34201030D3750057043E</string>
- <string>45CC34491030D5F90057043E</string>
+ <string>45EB43AF10316D7900AB8A5C</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -613,7 +646,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>0.0</real>
+ <real>271674745.613594</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -631,7 +664,7 @@
<string>/Users/muller/projects/osctools/maxmsp externals/zeroconf_service/zeroconf.service.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>0 129 1920 1049 0 0 1920 1178 </string>
+ <string>50 222 1012 656 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
View
6 test/ZeroConfBrowser/ZeroConfBrowser.xcodeproj/muller.pbxuser
@@ -134,9 +134,9 @@
};
4542E4AF10302D6D00C13320 /* NetServiceThread.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1122, 1022}}";
- sepNavSelRange = "{136, 16}";
- sepNavVisRange = "{0, 797}";
+ sepNavIntBoundsRect = "{{0, 0}, {1122, 994}}";
+ sepNavSelRange = "{136, 1239}";
+ sepNavVisRange = "{501, 876}";
};
};
4542E4B010302D6D00C13320 /* NetServiceThread.h */ = {

0 comments on commit ce4afd7

Please sign in to comment.
Something went wrong with that request. Please try again.