linuxaudio
/
new-session-manager
mirror of https://github.com/linuxaudio/new-session-manager
1
0
Fork 0
Code Issues 0 Releases 17 Wiki Activity
Browse Source

Change license to GPLv3 but do _not_ claim copyright for unaltered files

tags/v1.3
Nils 5 years ago
parent
9f228b6b10
commit
3814780563
14 changed files with 1127 additions and 760 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +617
    -282
      COPYING
  2. +5
    -4
      README.md
  3. +20
    -1
      meson.build
  4. +94
    -93
      src/Endpoint.cpp
  5. +30
    -29
      src/Endpoint.hpp
  6. +14
    -13
      src/Thread.cpp
  7. +13
    -12
      src/Thread.hpp
  8. +42
    -40
      src/debug.cpp
  9. +25
    -24
      src/debug.h
  10. +15
    -14
      src/file.cpp
  11. +13
    -12
      src/file.h
  12. +50
    -49
      src/jackpatch.c
  13. +34
    -34
      src/nsm.h
  14. +155
    -153
      src/nsmd.cpp

+ 617
- 282
COPYING View File

@@ -1,281 +1,622 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Version 3, 29 June 2007


Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.


Preamble Preamble


The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
The GNU General Public License is a free, copyleft license for
software and other kinds of works.

The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too. your programs, too.


When we speak of free software, we are referring to freedom, not When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.


To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.


For example, if you distribute copies of such a program, whether For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.

We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.

Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.

For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.

Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.

Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.


The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution and
modification follow. modification follow.


GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.

b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.

c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,

b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,

c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
TERMS AND CONDITIONS

0. Definitions.

"This License" refers to version 3 of the GNU General Public License.

"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.

"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.

To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.

A "covered work" means either the unmodified Program or a work based
on the Program.

To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.

To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.

An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.

1. Source Code.

The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.

A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.

The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.

The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.

The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.

The Corresponding Source for a work in source code form is that
same work.

2. Basic Permissions.

All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.

You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.

Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.

When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.

4. Conveying Verbatim Copies.

You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.

You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.

5. Conveying Modified Source Versions.

You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:

a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.

b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".

c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.

d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.

A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.

6. Conveying Non-Source Forms.

You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:

a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.

b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.

c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.

d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.

e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.

A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.

A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.

"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.

If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).

The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.

Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.

7. Additional Terms.

"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.

When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.

Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:

a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or

b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or

c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or

d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or

e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or

f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.

All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.

If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.

Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.

8. Termination.

You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).

However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.

Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.

Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.

9. Acceptance Not Required for Having Copies.

You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.

10. Automatic Licensing of Downstream Recipients.

Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.

An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.

You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.

11. Patents.

A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".

A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License. this License.


7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.

In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.

If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.

If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.

A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.

Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.

12. No Surrender of Others' Freedom.

If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.

9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.

13. Use with the GNU Affero General Public License.

Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.

14. Revised Versions of this License.

The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to be similar in spirit to the present version, but may differ in detail to
address new problems or concerns. address new problems or concerns.


Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

NO WARRANTY

11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.

If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.

Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.

15. Disclaimer of Warranty.

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

16. Limitation of Liability.

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.

17. Interpretation of Sections 15 and 16.

If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.


END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS


@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.


To do so, attach the following notices to the program. It is safest To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found. the "copyright" line and a pointer to where the full notice is found.


<one line to give the program's name and a brief idea of what it does.> <one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author> Copyright (C) <year> <name of author>


This program is free software; you can redistribute it and/or modify
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.


This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
@@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.


You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.


Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.


If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:


Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.


The hypothetical commands `show w' and `show c' should show the appropriate The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:

Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.

<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

+ 5
- 4
README.md View File

@@ -15,18 +15,19 @@ This repository contains no user interface. Recommendations for a good one might


## Fork and License ## Fork and License
This is a fork of non-session-manager, by Jonathan Moore Liles <male@tuxfamily.net> http://non.tuxfamily.org/ This is a fork of non-session-manager, by Jonathan Moore Liles <male@tuxfamily.net> http://non.tuxfamily.org/
under the GNU GENERAL PUBLIC LICENSE Version 2, June 1991.
which was released the GNU GENERAL PUBLIC LICENSE Version 2, June 1991.


All files, except nsm.h kept in this repository are GPL "version 2 of the License, or (at your
All files, except nsm.h kept in this fork were GPL "version 2 of the License, or (at your
option) any later version." option) any later version."


`nsm.h` is licenced under the ISCL. `nsm.h` is licenced under the ISCL.


Build files and FLTK definitions have no license header and will be removed.
New-Session-Manager changed the license to GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007.
See file COPYING


## Build
The current repository builds the original `nsmd` and `jackpatch`. The current repository builds the original `nsmd` and `jackpatch`.


## Build
Dependencies are jack2 and liblo, the OSC library. Dependencies are jack2 and liblo, the OSC library.
The build system is meson. The build system is meson.




+ 20
- 1
meson.build View File

@@ -1,7 +1,26 @@
##############################################################################
# Copyright (C) 2020- Nils Hilbricht
#
# This file is part of New-Session-Manager
#
# New-Session-Manager is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# New-Session-Manager is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.
##############################################################################

project('new-session-manager', 'c', 'cpp', version : '1.3.0', license : 'GPLv3') project('new-session-manager', 'c', 'cpp', version : '1.3.0', license : 'GPLv3')


liblodep = dependency('liblo') #and not 'lo' liblodep = dependency('liblo') #and not 'lo'
threaddep = dependency('threads')
threaddep = dependency('threads')
jackdep = dependency('jack') #and not 'libjack' jackdep = dependency('jack') #and not 'libjack'


executable('nsmd', executable('nsmd',


+ 94
- 93
src/Endpoint.cpp View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2010 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#include <lo/lo.h> #include <lo/lo.h>
@@ -41,7 +42,7 @@ namespace OSC
{ {
_path = _typespec = _documentation = 0; _path = _typespec = _documentation = 0;
} }
Method::~Method ( ) Method::~Method ( )
{ {
if ( _path ) if ( _path )
@@ -57,7 +58,7 @@ namespace OSC
/**********/ /**********/


Signal::Signal ( const char *path, Direction dir ) Signal::Signal ( const char *path, Direction dir )
{
{
_direction = dir; _direction = dir;
_path = NULL; _path = NULL;
if ( path ) if ( path )
@@ -77,7 +78,7 @@ namespace OSC
{ {
_endpoint->del_signal( this ); _endpoint->del_signal( this );
} }
if ( _path ) if ( _path )
free( _path ); free( _path );
_path = NULL; _path = NULL;
@@ -99,7 +100,7 @@ namespace OSC
lo_server_add_method( _endpoint->_server, new_path, NULL, _endpoint->osc_sig_handler, this ); lo_server_add_method( _endpoint->_server, new_path, NULL, _endpoint->osc_sig_handler, this );
/* } */ /* } */


for ( std::list<Peer*>::iterator i = _endpoint->_peers.begin();
for ( std::list<Peer*>::iterator i = _endpoint->_peers.begin();
i != _endpoint->_peers.end(); i != _endpoint->_peers.end();
++i ) ++i )
{ {
@@ -117,21 +118,21 @@ namespace OSC
{ {
if ( f == _value ) if ( f == _value )
return; return;
_value = f; _value = f;
if ( direction() == Output ) if ( direction() == Output )
{ {
for ( std::list<Peer*>::iterator i = _endpoint->_peers.begin();
for ( std::list<Peer*>::iterator i = _endpoint->_peers.begin();
i != _endpoint->_peers.end(); i != _endpoint->_peers.end();
++i ) ++i )
{ {
_endpoint->send( (*i)->addr,
_endpoint->send( (*i)->addr,
path(), path(),
f ); f );
} }


// free(s);
// free(s);
} }
/* else if ( direction() == Input ) */ /* else if ( direction() == Input ) */
/* { */ /* { */
@@ -185,7 +186,7 @@ namespace OSC
} }


Endpoint::Endpoint ( ) Endpoint::Endpoint ( )
{
{
_learning_path = NULL; _learning_path = NULL;
_peer_signal_notification_callback = 0; _peer_signal_notification_callback = 0;
_peer_signal_notification_userdata = 0; _peer_signal_notification_userdata = 0;
@@ -206,7 +207,7 @@ namespace OSC
char *url = lo_server_get_url( _server ); char *url = lo_server_get_url( _server );
_addr = lo_address_new_from_url( url ); _addr = lo_address_new_from_url( url );
free( url ); free( url );
if ( ! _server ) if ( ! _server )
{ {
WARNING( "Error creating OSC server" ); WARNING( "Error creating OSC server" );
@@ -230,7 +231,7 @@ namespace OSC
Endpoint::~Endpoint ( ) Endpoint::~Endpoint ( )
{ {
// lo_server_thread_free( _st ); // lo_server_thread_free( _st );
for ( std::list<Method*>::iterator i = _methods.begin(); for ( std::list<Method*>::iterator i = _methods.begin();
i != _methods.end(); i != _methods.end();
i++ ) i++ )
@@ -265,7 +266,7 @@ namespace OSC


return NULL; return NULL;
} }


OSC::Signal * OSC::Signal *
Endpoint::find_peer_signal_by_path ( Peer *p, const char *path ) Endpoint::find_peer_signal_by_path ( Peer *p, const char *path )
@@ -280,7 +281,7 @@ namespace OSC


return NULL; return NULL;
} }
OSC::Signal * OSC::Signal *
Endpoint::find_signal_by_path ( const char *path ) Endpoint::find_signal_by_path ( const char *path )
{ {
@@ -305,7 +306,7 @@ namespace OSC
char *our_url = this->url(); char *our_url = this->url();
send( addr, "/signal/hello", name(), our_url ); send( addr, "/signal/hello", name(), our_url );
free( our_url ); free( our_url );
lo_address_free( addr ); lo_address_free( addr );
} }


@@ -314,8 +315,8 @@ namespace OSC
{ {
DMESSAGE( "Got hello from %s", peer_name ); DMESSAGE( "Got hello from %s", peer_name );


Peer *p = find_peer_by_name( peer_name );
Peer *p = find_peer_by_name( peer_name );
if ( ! p ) if ( ! p )
{ {
scan_peer( peer_name, peer_url ); scan_peer( peer_name, peer_url );
@@ -323,7 +324,7 @@ namespace OSC
else else
{ {
/* maybe the peer has a new URL */ /* maybe the peer has a new URL */
/* update address */ /* update address */
lo_address addr = lo_address_new_from_url( peer_url ); lo_address addr = lo_address_new_from_url( peer_url );


@@ -332,7 +333,7 @@ namespace OSC
free( addr ); free( addr );
return; return;
} }
if ( p->addr ) if ( p->addr )
free( p->addr ); free( p->addr );


@@ -340,12 +341,12 @@ namespace OSC


/* scan it while we're at it */ /* scan it while we're at it */
p->_scanning = true; p->_scanning = true;
DMESSAGE( "Scanning peer %s", peer_name ); DMESSAGE( "Scanning peer %s", peer_name );


send( p->addr, "/signal/list" ); send( p->addr, "/signal/list" );
} }
if ( name() ) if ( name() )
{ {
hello( peer_url ); hello( peer_url );
@@ -363,7 +364,7 @@ namespace OSC


const char *peer_name = &argv[0]->s; const char *peer_name = &argv[0]->s;
const char *peer_url = &argv[1]->s; const char *peer_url = &argv[1]->s;
ep->handle_hello( peer_name, peer_url ); ep->handle_hello( peer_name, peer_url );


return 0; return 0;
@@ -374,7 +375,7 @@ namespace OSC
{ {
const char *their_name = &argv[0]->s; const char *their_name = &argv[0]->s;
const char *our_name = &argv[1]->s; const char *our_name = &argv[1]->s;
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;


Signal *s = ep->find_signal_by_path( our_name ); Signal *s = ep->find_signal_by_path( our_name );
@@ -385,7 +386,7 @@ namespace OSC
if ( s->_direction == Signal::Input ) if ( s->_direction == Signal::Input )
{ {
DMESSAGE( "Peer %s has disconnected from signal %s", our_name, their_name ); DMESSAGE( "Peer %s has disconnected from signal %s", our_name, their_name );
ep->del_translation( their_name ); ep->del_translation( their_name );


if ( s->_connection_state_callback ) if ( s->_connection_state_callback )
@@ -402,7 +403,7 @@ namespace OSC
{ {
const char *src_path = &argv[0]->s; const char *src_path = &argv[0]->s;
const char *dst_path = &argv[1]->s; const char *dst_path = &argv[1]->s;
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;


Signal *dst_s = ep->find_signal_by_path( dst_path ); Signal *dst_s = ep->find_signal_by_path( dst_path );
@@ -433,11 +434,11 @@ namespace OSC
Endpoint::osc_sig_removed ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data ) Endpoint::osc_sig_removed ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data )
{ {
const char *name = &argv[0]->s; const char *name = &argv[0]->s;
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;


Peer *p = ep->find_peer_by_address( lo_message_get_source( msg ) ); Peer *p = ep->find_peer_by_address( lo_message_get_source( msg ) );
if ( ! p ) if ( ! p )
{ {
WARNING( "Got signal removed notification from unknown peer." ); WARNING( "Got signal removed notification from unknown peer." );
@@ -457,7 +458,7 @@ namespace OSC


if ( ep->_peer_signal_notification_callback ) if ( ep->_peer_signal_notification_callback )
ep->_peer_signal_notification_callback( o, Signal::Removed, ep->_peer_signal_notification_userdata ); ep->_peer_signal_notification_callback( o, Signal::Removed, ep->_peer_signal_notification_userdata );
p->_signals.remove(o); p->_signals.remove(o);


delete o; delete o;
@@ -469,7 +470,7 @@ namespace OSC
Endpoint::osc_sig_created ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data ) Endpoint::osc_sig_created ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data )
{ {
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;
const char *name = &argv[0]->s; const char *name = &argv[0]->s;
const char *direction = &argv[1]->s; const char *direction = &argv[1]->s;
const float min = argv[2]->f; const float min = argv[2]->f;
@@ -483,27 +484,27 @@ namespace OSC
WARNING( "Got signal creation notification from unknown peer" ); WARNING( "Got signal creation notification from unknown peer" );
return 0; return 0;
} }
Signal::Direction dir = Signal::Input; Signal::Direction dir = Signal::Input;
if ( !strcmp( direction, "in" ) ) if ( !strcmp( direction, "in" ) )
dir = Signal::Input; dir = Signal::Input;
else if ( !strcmp( direction, "out" ) ) else if ( !strcmp( direction, "out" ) )
dir = Signal::Output; dir = Signal::Output;
Signal *s = new Signal( name, dir ); Signal *s = new Signal( name, dir );
s->_peer = p; s->_peer = p;
s->parameter_limits( min, max, default_value ); s->parameter_limits( min, max, default_value );
p->_signals.push_back( s ); p->_signals.push_back( s );


DMESSAGE( "Peer %s has created signal %s (%s %f %f %f)", p->name,
DMESSAGE( "Peer %s has created signal %s (%s %f %f %f)", p->name,
name, direction, min, max, default_value ); name, direction, min, max, default_value );
if ( ep->_peer_signal_notification_callback ) if ( ep->_peer_signal_notification_callback )
ep->_peer_signal_notification_callback( s, Signal::Created, ep->_peer_signal_notification_userdata ); ep->_peer_signal_notification_callback( s, Signal::Created, ep->_peer_signal_notification_userdata );
return 0; return 0;
} }


@@ -518,7 +519,7 @@ namespace OSC
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;


Peer *p = ep->find_peer_by_address( lo_message_get_source( msg ) ); Peer *p = ep->find_peer_by_address( lo_message_get_source( msg ) );
if ( ! p ) if ( ! p )
{ {
WARNING( "Got signal rename notification from unknown peer." ); WARNING( "Got signal rename notification from unknown peer." );
@@ -534,7 +535,7 @@ namespace OSC
} }


DMESSAGE( "Signal %s was renamed to %s", o->_path, new_name ); DMESSAGE( "Signal %s was renamed to %s", o->_path, new_name );
ep->rename_translation_source( o->_path, new_name ); ep->rename_translation_source( o->_path, new_name );


free( o->_path ); free( o->_path );
@@ -571,7 +572,7 @@ namespace OSC


if ( o->_handler ) if ( o->_handler )
o->_handler( f, o->_user_data ); o->_handler( f, o->_user_data );
return 1; return 1;
} }


@@ -591,7 +592,7 @@ namespace OSC
conn[j++] = i->first.c_str(); conn[j++] = i->first.c_str();
} }
} }
if ( conn ) if ( conn )
conn[j] = 0; conn[j] = 0;


@@ -622,7 +623,7 @@ namespace OSC
void void
Endpoint::rename_translation_destination ( const char *a, const char *b ) Endpoint::rename_translation_destination ( const char *a, const char *b )
{ {
for ( std::map<std::string,TranslationDestination>::iterator i = _translations.begin(); for ( std::map<std::string,TranslationDestination>::iterator i = _translations.begin();
i != _translations.end(); i != _translations.end();
i++ ) i++ )
@@ -683,16 +684,16 @@ namespace OSC
ep->add_translation( path, ep->_learning_path ); ep->add_translation( path, ep->_learning_path );


DMESSAGE( "Learned translation \"%s\" -> \"%s\"", path, ep->_learning_path ); DMESSAGE( "Learned translation \"%s\" -> \"%s\"", path, ep->_learning_path );
free(ep->_learning_path); free(ep->_learning_path);
ep->_learning_path = NULL; ep->_learning_path = NULL;
return 0; return 0;
} }


{ {
std::map<std::string,TranslationDestination>::iterator i = ep->_translations.find( path ); std::map<std::string,TranslationDestination>::iterator i = ep->_translations.find( path );
if ( i != ep->_translations.end() ) if ( i != ep->_translations.end() )
{ {
const char *dpath = i->second.path.c_str(); const char *dpath = i->second.path.c_str();
@@ -737,7 +738,7 @@ namespace OSC
Endpoint::osc_signal_lister ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data ) Endpoint::osc_signal_lister ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data )
{ {
// OSC_DMSG(); // OSC_DMSG();
DMESSAGE( "Listing signals." ); DMESSAGE( "Listing signals." );


const char *prefix = NULL; const char *prefix = NULL;
@@ -754,7 +755,7 @@ namespace OSC
if ( ! prefix || ! strncmp( o->path(), prefix, strlen(prefix) ) ) if ( ! prefix || ! strncmp( o->path(), prefix, strlen(prefix) ) )
{ {
ep->send( lo_message_get_source( msg ), ep->send( lo_message_get_source( msg ),
"/reply",
"/reply",
path, path,
o->path(), o->path(),
o->_direction == Signal::Input ? "in" : "out", o->_direction == Signal::Input ? "in" : "out",
@@ -764,7 +765,7 @@ namespace OSC
); );
} }
} }
ep->send( lo_message_get_source( msg ), "/reply", path ); ep->send( lo_message_get_source( msg ), "/reply", path );


return 0; return 0;
@@ -780,7 +781,7 @@ namespace OSC


free( purl ); free( purl );
free( url ); free( url );
return r; return r;
} }


@@ -788,11 +789,11 @@ namespace OSC
void void
Endpoint::list_peer_signals ( void *v ) Endpoint::list_peer_signals ( void *v )
{ {
for ( std::list<Peer*>::iterator i = _peers.begin();
for ( std::list<Peer*>::iterator i = _peers.begin();
i != _peers.end(); i != _peers.end();
++i ) ++i )
{ {
for ( std::list<Signal*>::iterator j = (*i)->_signals.begin();
for ( std::list<Signal*>::iterator j = (*i)->_signals.begin();
j != (*i)->_signals.end(); j != (*i)->_signals.end();
++j ) ++j )
{ {
@@ -809,7 +810,7 @@ namespace OSC


Peer *p = NULL; Peer *p = NULL;


for ( std::list<Peer*>::iterator i = _peers.begin();
for ( std::list<Peer*>::iterator i = _peers.begin();
i != _peers.end(); i != _peers.end();
++i ) ++i )
{ {
@@ -832,7 +833,7 @@ namespace OSC
Peer * Peer *
Endpoint::find_peer_by_name ( const char *name ) Endpoint::find_peer_by_name ( const char *name )
{ {
for ( std::list<Peer*>::iterator i = _peers.begin();
for ( std::list<Peer*>::iterator i = _peers.begin();
i != _peers.end(); i != _peers.end();
++i ) ++i )
{ {
@@ -850,7 +851,7 @@ namespace OSC
{ {
if ( s->_direction == Signal::Output ) if ( s->_direction == Signal::Output )
{ {
for ( std::list<Peer*>::iterator i = _peers.begin();
for ( std::list<Peer*>::iterator i = _peers.begin();
i != _peers.end(); i != _peers.end();
++i ) ++i )
{ {
@@ -858,13 +859,13 @@ namespace OSC
s->path(), s->path(),
signal_path); signal_path);
} }
return true; return true;
} }


return false; return false;
} }
bool bool
Endpoint::connect_signal( OSC::Signal *s, const char *signal_path ) Endpoint::connect_signal( OSC::Signal *s, const char *signal_path )
{ {
@@ -874,19 +875,19 @@ namespace OSC
i != _peers.end(); i != _peers.end();
i++ ) i++ )
{ {
send( (*i)->addr, "/signal/connect", send( (*i)->addr, "/signal/connect",
s->path(), s->path(),
signal_path ); signal_path );
} }
} }
return true; return true;
} }


int int
Endpoint::osc_reply ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data ) Endpoint::osc_reply ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data )
{ {
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;


@@ -924,11 +925,11 @@ namespace OSC
else if ( !strcmp( &argv[2]->s, "out" ) ) else if ( !strcmp( &argv[2]->s, "out" ) )
dir = Signal::Output; dir = Signal::Output;


s = new Signal( &argv[1]->s, (Signal::Direction)dir ); s = new Signal( &argv[1]->s, (Signal::Direction)dir );
s->_peer = p; s->_peer = p;
s->parameter_limits( argv[3]->f, argv[4]->f, argv[5]->f ); s->parameter_limits( argv[3]->f, argv[4]->f, argv[5]->f );


p->_signals.push_back( s ); p->_signals.push_back( s );
@@ -948,19 +949,19 @@ namespace OSC
Method * Method *
Endpoint::add_method ( const char *path, const char *typespec, lo_method_handler handler, void *user_data, const char *argument_description ) Endpoint::add_method ( const char *path, const char *typespec, lo_method_handler handler, void *user_data, const char *argument_description )
{ {
// DMESSAGE( "Added OSC method %s (%s)", path, typespec );
// DMESSAGE( "Added OSC method %s (%s)", path, typespec );
lo_server_add_method( _server, path, typespec, handler, user_data ); lo_server_add_method( _server, path, typespec, handler, user_data );


Method *md = new Method; Method *md = new Method;
if ( path ) if ( path )
md->_path = strdup( path ); md->_path = strdup( path );
if ( typespec ) if ( typespec )
md->_typespec = strdup( typespec ); md->_typespec = strdup( typespec );
if ( argument_description ) if ( argument_description )
md->_documentation = strdup( argument_description ); md->_documentation = strdup( argument_description );
_methods.push_back( md ); _methods.push_back( md );


return md; return md;
@@ -973,7 +974,7 @@ namespace OSC
asprintf( &s, "%s%s", name() ? name() : "", path ); asprintf( &s, "%s%s", name() ? name() : "", path );


Signal *o = new Signal( s, dir ); Signal *o = new Signal( s, dir );
free(s); free(s);


o->_handler = handler; o->_handler = handler;
@@ -981,9 +982,9 @@ namespace OSC
o->_endpoint = this; o->_endpoint = this;


o->parameter_limits( min, max, default_value ); o->parameter_limits( min, max, default_value );
_signals.push_back( o ); _signals.push_back( o );
/* if ( dir == Signal::Input ) */ /* if ( dir == Signal::Input ) */
/* { */ /* { */
lo_server_add_method( _server, o->_path, NULL, osc_sig_handler, o ); lo_server_add_method( _server, o->_path, NULL, osc_sig_handler, o );
@@ -1010,7 +1011,7 @@ namespace OSC
void void
Endpoint::del_method ( const char *path, const char *typespec ) Endpoint::del_method ( const char *path, const char *typespec )
{ {
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );


lo_server_del_method( _server, path, typespec ); lo_server_del_method( _server, path, typespec );


@@ -1033,7 +1034,7 @@ namespace OSC
void void
Endpoint::del_method ( Method *meth ) Endpoint::del_method ( Method *meth )
{ {
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );


lo_server_del_method( _server, meth->path(), meth->typespec() ); lo_server_del_method( _server, meth->path(), meth->typespec() );


@@ -1045,7 +1046,7 @@ namespace OSC
void void
Endpoint::del_signal ( Signal *o ) Endpoint::del_signal ( Signal *o )
{ {
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );
// DMESSAGE( "Deleted OSC method %s (%s)", path, typespec );


lo_server_del_method( _server, o->path(), NULL ); lo_server_del_method( _server, o->path(), NULL );


@@ -1055,7 +1056,7 @@ namespace OSC
++i ) ++i )
{ {
send( (*i)->addr, send( (*i)->addr,
"/signal/removed",
"/signal/removed",
o->path() ); o->path() );
} }


@@ -1095,7 +1096,7 @@ namespace OSC
// DMESSAGE( "Sending feedback to \"%s\": %f", spath, v ); // DMESSAGE( "Sending feedback to \"%s\": %f", spath, v );


/* send to all peers */ /* send to all peers */
for ( std::list<Peer*>::iterator p = _peers.begin();
for ( std::list<Peer*>::iterator p = _peers.begin();
p != _peers.end(); p != _peers.end();
++p ) ++p )
{ {
@@ -1113,7 +1114,7 @@ namespace OSC
} }
} }


Peer *
Peer *
Endpoint::add_peer ( const char *name, const char *url ) Endpoint::add_peer ( const char *name, const char *url )
{ {
Peer *p = new Peer; Peer *p = new Peer;
@@ -1122,9 +1123,9 @@ namespace OSC


p->name = strdup( name ); p->name = strdup( name );
p->addr = lo_address_new_from_url( url ); p->addr = lo_address_new_from_url( url );
_peers.push_back( p ); _peers.push_back( p );
return p; return p;
} }


@@ -1154,7 +1155,7 @@ namespace OSC
_thread.name( "OSC" ); _thread.name( "OSC" );


DMESSAGE( "OSC Thread running" ); DMESSAGE( "OSC Thread running" );
run(); run();
} }


@@ -1386,13 +1387,13 @@ namespace OSC
{ {
return lo_send_from( to, _server, LO_TT_IMMEDIATE, path, "sssifff", v1, v2, v3, v4, v5, v6, v7 ); return lo_send_from( to, _server, LO_TT_IMMEDIATE, path, "sssifff", v1, v2, v3, v4, v5, v6, v7 );
} }
int int
Endpoint::send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, float v4, float v5, float v6 ) Endpoint::send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, float v4, float v5, float v6 )
{
{
return lo_send_from( to, _server, LO_TT_IMMEDIATE, path, "sssfff", v1, v2, v3, v4, v5, v6 ); return lo_send_from( to, _server, LO_TT_IMMEDIATE, path, "sssfff", v1, v2, v3, v4, v5, v6 );
} }
int int
Endpoint::send ( lo_address to, const char *path, const char *v1, int v2, int v3 ) Endpoint::send ( lo_address to, const char *path, const char *v1, int v2, int v3 )
{ {


+ 30
- 29
src/Endpoint.hpp View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2010 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#pragma once #pragma once
@@ -154,7 +155,7 @@ namespace OSC


char *_path; char *_path;
char *_documentation; char *_documentation;
float _value; float _value;


Direction _direction; Direction _direction;
@@ -162,7 +163,7 @@ namespace OSC
signal_handler _handler; signal_handler _handler;
void *_user_data; void *_user_data;
Parameter_Limits _parameter_limits; Parameter_Limits _parameter_limits;
void (*_connection_state_callback)(OSC::Signal *, void*); void (*_connection_state_callback)(OSC::Signal *, void*);
void *_connection_state_userdata; void *_connection_state_userdata;


@@ -186,7 +187,7 @@ namespace OSC
} }




void connection_state_callback ( void(*_cb)(OSC::Signal *, void*), void *userdata)
void connection_state_callback ( void(*_cb)(OSC::Signal *, void*), void *userdata)
{ {
_connection_state_callback = _cb; _connection_state_callback = _cb;
_connection_state_userdata = userdata; _connection_state_userdata = userdata;
@@ -204,7 +205,7 @@ namespace OSC
float value ( void ) const { return _value; } float value ( void ) const { return _value; }


bool is_connected_to ( const Signal *s ) const; bool is_connected_to ( const Signal *s ) const;
friend class Endpoint; friend class Endpoint;
}; };


@@ -229,13 +230,13 @@ namespace OSC
class Endpoint class Endpoint
{ {
Thread _thread; Thread _thread;
friend class Signal; friend class Signal;


// lo_server_thread _st; // lo_server_thread _st;
lo_server _server; lo_server _server;
lo_address _addr; lo_address _addr;
std::list<Peer*> _peers; std::list<Peer*> _peers;
std::list<Signal*> _signals; std::list<Signal*> _signals;
std::list<Method*> _methods; std::list<Method*> _methods;
@@ -249,7 +250,7 @@ namespace OSC
float current_value; float current_value;
bool suppress_feedback; bool suppress_feedback;


TranslationDestination ( )
TranslationDestination ( )
{ {
suppress_feedback = false; suppress_feedback = false;
current_value = -1.0f; current_value = -1.0f;
@@ -285,10 +286,10 @@ namespace OSC


static void *osc_thread ( void *arg ); static void *osc_thread ( void *arg );
void osc_thread ( void ); void osc_thread ( void );
OSC::Signal *find_peer_signal_by_path ( Peer *p, const char *path ); OSC::Signal *find_peer_signal_by_path ( Peer *p, const char *path );
OSC::Signal *find_signal_by_path ( const char *path ); OSC::Signal *find_signal_by_path ( const char *path );
Peer *find_peer_by_name ( const char *name ); Peer *find_peer_by_name ( const char *name );
Peer *find_peer_by_address ( lo_address addr ); Peer *find_peer_by_address ( lo_address addr );
static bool address_matches ( lo_address addr1, lo_address addr2 ); static bool address_matches ( lo_address addr1, lo_address addr2 );
@@ -298,7 +299,7 @@ namespace OSC
void del_signal ( Signal *signal ); void del_signal ( Signal *signal );
void send_signal_rename_notifications( Signal *s ); void send_signal_rename_notifications( Signal *s );


void (*_peer_signal_notification_callback)( OSC::Signal *, OSC::Signal::State, void*); void (*_peer_signal_notification_callback)( OSC::Signal *, OSC::Signal::State, void*);
void *_peer_signal_notification_userdata; void *_peer_signal_notification_userdata;


@@ -326,7 +327,7 @@ namespace OSC
_peer_signal_notification_callback = cb; _peer_signal_notification_callback = cb;
_peer_signal_notification_userdata = userdata; _peer_signal_notification_userdata = userdata;
} }
// can be used to point back to owning object. // can be used to point back to owning object.
void *owner; void *owner;


@@ -337,11 +338,11 @@ namespace OSC
Endpoint ( ); Endpoint ( );


~Endpoint ( ); ~Endpoint ( );
bool disconnect_signal ( OSC::Signal *s, OSC::Signal *d ); bool disconnect_signal ( OSC::Signal *s, OSC::Signal *d );
bool disconnect_signal ( OSC::Signal *s, const char *signal_path );
bool disconnect_signal ( OSC::Signal *s, const char *signal_path );
bool connect_signal ( OSC::Signal *s, OSC::Signal *d ); bool connect_signal ( OSC::Signal *s, OSC::Signal *d );
bool connect_signal ( OSC::Signal *s, const char *peer_name, const char *signal_path );
bool connect_signal ( OSC::Signal *s, const char *peer_name, const char *signal_path );
// bool connect_signal ( OSC::Signal *s, const char *peer_name, int signal_id ); // bool connect_signal ( OSC::Signal *s, const char *peer_name, int signal_id );
bool connect_signal ( OSC::Signal *s, const char *peer_and_path ); bool connect_signal ( OSC::Signal *s, const char *peer_and_path );


@@ -382,7 +383,7 @@ namespace OSC
int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3 ); int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3 );
int send ( lo_address to, const char *path, const char *v1, int v2, int v3, int v4 ); int send ( lo_address to, const char *path, const char *v1, int v2, int v3, int v4 );
int send ( lo_address to, const char *path, const char *v1, const char *v2, int v3, int v4, int v5 ); int send ( lo_address to, const char *path, const char *v1, const char *v2, int v3, int v4, int v5 );
int send ( lo_address to, const char *path, const char *v1, int v2 ); int send ( lo_address to, const char *path, const char *v1, int v2 );
int send ( lo_address to, const char *path, int v1, const char *v2 ); int send ( lo_address to, const char *path, int v1, const char *v2 );
int send ( lo_address to, const char *path, const char *v1, int v2, int v3, float v4 ); int send ( lo_address to, const char *path, const char *v1, int v2, int v3, float v4 );
@@ -397,12 +398,12 @@ namespace OSC
int send ( lo_address to, const char *path, lo_message msg ); int send ( lo_address to, const char *path, lo_message msg );


int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, float v4, float v5, float v6 ); int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, float v4, float v5, float v6 );
int send ( lo_address to, const char *path, const char *v1, const char *v2, int v3, float v4, float v5, float v6 ); int send ( lo_address to, const char *path, const char *v1, const char *v2, int v3, float v4, float v5, float v6 );


int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, int v4, float v5, float v6, float v7 ); int send ( lo_address to, const char *path, const char *v1, const char *v2, const char *v3, int v4, float v5, float v6, float v7 );


void peer_scan_complete_callback ( void(*_cb)(void*), void *userdata)
void peer_scan_complete_callback ( void(*_cb)(void*), void *userdata)
{ {
_peer_scan_complete_callback = _cb; _peer_scan_complete_callback = _cb;
_peer_scan_complete_userdata = userdata; _peer_scan_complete_userdata = userdata;


+ 14
- 13
src/Thread.cpp View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#include "Thread.hpp" #include "Thread.hpp"
@@ -91,7 +92,7 @@ Thread::run_thread ( void *arg )
void * r = td.entry_point( td.arg ); void * r = td.entry_point( td.arg );


((Thread*)td.t)->_running = false; ((Thread*)td.t)->_running = false;
return r; return r;
} }




+ 13
- 12
src/Thread.hpp View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#pragma once #pragma once


+ 42
- 40
src/debug.cpp View File

@@ -1,22 +1,24 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/



#include "debug.h" #include "debug.h"


#include <string.h> #include <string.h>
@@ -27,42 +29,42 @@ extern char * program_invocation_short_name;


void void
warnf ( warning_t level, warnf ( warning_t level,
const char *module,
const char *file,
const char *function, int line, const char *fmt, ... )
const char *module,
const char *file,
const char *function, int line, const char *fmt, ... )
{ {
va_list args;
static const char *level_tab[] = {
"message", "\033[1;32m",
"warning", "\033[1;33m",
"assertion", "\033[1;31m"
};
va_list args;
static const char *level_tab[] = {
"message", "\033[1;32m",
"warning", "\033[1;33m",
"assertion", "\033[1;31m"
};


module = program_invocation_short_name; module = program_invocation_short_name;


if ( module )
fprintf( stderr, "[\033[1;30m%s\033[0m] ", module );
if ( module )
fprintf( stderr, "[\033[1;30m%s\033[0m] ", module );
#ifndef NDEBUG #ifndef NDEBUG
if ( file )
fprintf( stderr, "%s", file );
if ( line )
fprintf( stderr, ":%i", line );
if ( function )
fprintf( stderr, " %s()", function );
if ( file )
fprintf( stderr, "%s", file );
if ( line )
fprintf( stderr, ":%i", line );
if ( function )
fprintf( stderr, " %s()", function );


fprintf( stderr, ": " );
fprintf( stderr, ": " );
#endif #endif


if ( unsigned( ( level << 1 ) + 1 ) <
( sizeof( level_tab ) / sizeof( level_tab[0] ) ) )
fprintf( stderr, "%s", level_tab[( level << 1 ) + 1] );
if ( unsigned( ( level << 1 ) + 1 ) <
( sizeof( level_tab ) / sizeof( level_tab[0] ) ) )
fprintf( stderr, "%s", level_tab[( level << 1 ) + 1] );


if ( fmt )
{
va_start( args, fmt );
vfprintf( stderr, fmt, args );
va_end( args );
}
if ( fmt )
{
va_start( args, fmt );
vfprintf( stderr, fmt, args );
va_end( args );
}


fprintf( stderr, "\033[0m\n" );
fprintf( stderr, "\033[0m\n" );
} }

+ 25
- 24
src/debug.h View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


/* debug.h /* debug.h
@@ -27,16 +28,16 @@
* *
* The following macros sould be defined as string literals * The following macros sould be defined as string literals
* *
* name value
* name value
* *
* __MODULE__ Name of module. eg. "libfoo"
* __MODULE__ Name of module. eg. "libfoo"
* *
* __FILE__ Name of file. eg. "foo.c"
* __FILE__ Name of file. eg. "foo.c"
* *
* __FUNCTION__ Name of enclosing function. eg. "bar"
* __FUNCTION__ Name of enclosing function. eg. "bar"
* *
* (inteter literal)
* __LINE__ Number of enclosing line.
* (inteter literal)
* __LINE__ Number of enclosing line.
* *
* *
* __FILE__, and __LINE__ are automatically defined by standard CPP * __FILE__, and __LINE__ are automatically defined by standard CPP
@@ -78,19 +79,19 @@
#endif #endif


#ifndef __GNUC__ #ifndef __GNUC__
#define __FUNCTION__ NULL
#define __FUNCTION__ NULL
#endif #endif


typedef enum { typedef enum {
W_MESSAGE = 0,
W_WARNING,
W_FATAL
W_MESSAGE = 0,
W_WARNING,
W_FATAL
} warning_t; } warning_t;


void void
warnf ( warning_t level, warnf ( warning_t level,
const char *module,
const char *file,
const char *module,
const char *file,
const char *function, int line, const char *fmt, ... ); const char *function, int line, const char *fmt, ... );






+ 15
- 14
src/file.cpp View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#include <fcntl.h> #include <fcntl.h>
@@ -128,11 +129,11 @@ backwards_afgets ( FILE *fp )
s[i++] = c; s[i++] = c;


} }
if ( s ) if ( s )
{ {
s[i] = 0; s[i] = 0;
int len = strlen(s) ; int len = strlen(s) ;
int c, i, j; int c, i, j;




+ 13
- 12
src/file.h View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


#include <stdio.h> #include <stdio.h>


+ 50
- 49
src/jackpatch.c View File

@@ -1,20 +1,21 @@


/*******************************************************************************/ /*******************************************************************************/
/* Copyright (C) 2008 Jonathan Moore Liles */
/* Copyright (C) 2008-2020 Jonathan Moore Liles (as "Non-Session-Manager") */
/* */ /* */
/* This program is free software; you can redistribute it and/or modify it */
/* under the terms of the GNU General Public License as published by the */
/* Free Software Foundation; either version 2 of the License, or (at your */
/* option) any later version. */
/* This file is part of New-Session-Manager */
/* */ /* */
/* This program is distributed in the hope that it will be useful, but WITHOUT */
/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */
/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */
/* more details. */
/* New-Session-Manager is free software: you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation, either version 3 of the License, or */
/* (at your option) any later version. */
/* */ /* */
/* You should have received a copy of the GNU General Public License along */
/* with This program; see the file COPYING. If not,write to the Free Software */
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* New-Session-Manager is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with New-Session-Manager. If not, see <https://www.gnu.org/licenses/>.*/
/*******************************************************************************/ /*******************************************************************************/


/* jackpatch.c /* jackpatch.c
@@ -56,13 +57,13 @@ char *project_file;


#undef VERSION #undef VERSION
#define APP_TITLE "JACKPatch" #define APP_TITLE "JACKPatch"
#define VERSION "0.2"
#define VERSION "0.2"


struct patch_record { struct patch_record {
struct {
char *client;
char *port;
} src , dst;
struct {
char *client;
char *port;
} src , dst;
int active; /* true if patch has already been activate (by us) */ int active; /* true if patch has already been activate (by us) */
struct patch_record *next; struct patch_record *next;
}; };
@@ -91,30 +92,30 @@ static jack_ringbuffer_t *port_ringbuffer = NULL;
void void
print_patch ( struct patch_record *pr, int mode ) print_patch ( struct patch_record *pr, int mode )
{ {
printf( "%s from '%s:%s' to '%s:%s'\n", mode ? ">>" : "::",
pr->src.client, pr->src.port, pr->dst.client, pr->dst.port );
printf( "%s from '%s:%s' to '%s:%s'\n", mode ? ">>" : "::",
pr->src.client, pr->src.port, pr->dst.client, pr->dst.port );


} }


void void
enqueue ( struct patch_record *p ) enqueue ( struct patch_record *p )
{ {
p->next = patch_list;
patch_list = p;
p->next = patch_list;
patch_list = p;
} }


void void
dequeue ( struct patch_record *pr ) dequeue ( struct patch_record *pr )
{ {
if ( !pr )
return;
if ( !pr )
return;


free( pr->src.port );
free( pr->dst.port );
free( pr->src.client );
free( pr->dst.client );
free( pr->src.port );
free( pr->dst.port );
free( pr->src.client );
free( pr->dst.client );


free( pr );
free( pr );
} }


void void
@@ -389,7 +390,7 @@ void remove_known_port ( const char *port )
{ {
struct port_record *pr; struct port_record *pr;
struct port_record *lp = NULL; struct port_record *lp = NULL;
for ( pr = known_ports; pr; lp = pr, pr = pr->next ) for ( pr = known_ports; pr; lp = pr, pr = pr->next )
if ( !strcmp( port, pr->port ) ) if ( !strcmp( port, pr->port ) )
{ {
@@ -397,14 +398,14 @@ void remove_known_port ( const char *port )
lp->next = pr->next; lp->next = pr->next;
else else
known_ports = pr->next; known_ports = pr->next;
free( pr->port ); free( pr->port );
free( pr ); free( pr );
break; break;
} }
} }
/* now mark all patches including this port as inactive */ /* now mark all patches including this port as inactive */
inactivate_patch ( port ); inactivate_patch ( port );
} }
@@ -428,12 +429,12 @@ register_prexisting_ports ( void )


if ( ! ports ) if ( ! ports )
return; return;
for ( port = ports; *port; port++ ) for ( port = ports; *port; port++ )
{ {
handle_new_port( *port ); handle_new_port( *port );
} }
free( ports ); free( ports );
} }


@@ -503,7 +504,7 @@ snapshot ( const char *file )
free( ports ); free( ports );


qsort( table, table_index, sizeof(char*), stringsort ); qsort( table, table_index, sizeof(char*), stringsort );
int i; int i;
for ( i = 0; i < table_index; i++ ) for ( i = 0; i < table_index; i++ )
{ {
@@ -544,12 +545,12 @@ die ( void )
void void
set_traps ( void ) set_traps ( void )
{ {
signal( SIGHUP, signal_handler );
signal( SIGINT, signal_handler );
// signal( SIGQUIT, signal_handler );
// signal( SIGSEGV, signal_handler );
// signal( SIGPIPE, signal_handler );
signal( SIGTERM, signal_handler );
signal( SIGHUP, signal_handler );
signal( SIGINT, signal_handler );
// signal( SIGQUIT, signal_handler );
// signal( SIGSEGV, signal_handler );
// signal( SIGPIPE, signal_handler );
signal( SIGTERM, signal_handler );
} }


/****************/ /****************/
@@ -579,10 +580,10 @@ osc_announce_reply ( const char *path, const char *types, lo_arg **argv, int arg
return -1; return -1;


printf( "Successfully registered. NSM says: %s", &argv[1]->s ); printf( "Successfully registered. NSM says: %s", &argv[1]->s );
nsm_is_active = 1; nsm_is_active = 1;
nsm_addr = lo_address_new_from_url( lo_address_get_url( lo_message_get_source( msg ) ) ); nsm_addr = lo_address_new_from_url( lo_address_get_url( lo_message_get_source( msg ) ) );
return 0; return 0;
} }


@@ -613,7 +614,7 @@ osc_open ( const char *path, const char *types, lo_arg **argv, int argc, lo_mess
// const char *display_name = &argv[1]->s; // const char *display_name = &argv[1]->s;


char *new_filename; char *new_filename;
asprintf( &new_filename, "%s.jackpatch", new_path ); asprintf( &new_filename, "%s.jackpatch", new_path );


struct stat st; struct stat st;
@@ -642,7 +643,7 @@ osc_open ( const char *path, const char *types, lo_arg **argv, int argc, lo_mess


if ( project_file ) if ( project_file )
free( project_file ); free( project_file );
project_file = new_filename; project_file = new_filename;


lo_send_from( nsm_addr, losrv, LO_TT_IMMEDIATE, "/reply", "ss", path, "OK" ); lo_send_from( nsm_addr, losrv, LO_TT_IMMEDIATE, "/reply", "ss", path, "OK" );
@@ -696,7 +697,7 @@ dequeue_new_port ( void )
if ( jack_ringbuffer_read_space( port_ringbuffer ) >= size ); if ( jack_ringbuffer_read_space( port_ringbuffer ) >= size );
{ {
struct port_notification_record *pr = malloc( size ); struct port_notification_record *pr = malloc( size );
jack_ringbuffer_read( port_ringbuffer, (char*)pr, size ); jack_ringbuffer_read( port_ringbuffer, (char*)pr, size );


return pr; return pr;
@@ -718,7 +719,7 @@ check_for_new_ports ( void )
handle_new_port( p->port ); handle_new_port( p->port );
else else
remove_known_port( p->port ); remove_known_port( p->port );
free( p ); free( p );
} }
} }
@@ -762,13 +763,13 @@ main ( int argc, char **argv )
{ {
fprintf( stderr, "Could not register JACK client\n" ); fprintf( stderr, "Could not register JACK client\n" );
exit(1); exit(1);
} }


port_ringbuffer = jack_ringbuffer_create( 1024 * 8 ); port_ringbuffer = jack_ringbuffer_create( 1024 * 8 );


set_traps(); set_traps();
if ( argc > 1 ) if ( argc > 1 )
{ {
maybe_activate_jack_client(); maybe_activate_jack_client();


+ 34
- 34
src/nsm.h View File

@@ -98,11 +98,11 @@ typedef int (nsm_broadcast_callback)( const char *, lo_message m, void *userdata
struct _nsm_client_t struct _nsm_client_t
{ {
const char *nsm_url; const char *nsm_url;
lo_server _server; lo_server _server;
lo_server_thread _st; lo_server_thread _st;
lo_address nsm_addr; lo_address nsm_addr;
int nsm_is_active; int nsm_is_active;
char *nsm_client_id; char *nsm_client_id;
char *_session_manager_name; char *_session_manager_name;
@@ -160,12 +160,12 @@ nsm_new ( void )


nsm->nsm_is_active = 0; nsm->nsm_is_active = 0;
nsm->nsm_client_id = 0; nsm->nsm_client_id = 0;
nsm->_server = 0; nsm->_server = 0;
nsm->_st = 0; nsm->_st = 0;
nsm->nsm_addr = 0; nsm->nsm_addr = 0;
nsm->_session_manager_name = 0; nsm->_session_manager_name = 0;
nsm->open = 0; nsm->open = 0;
nsm->save = 0; nsm->save = 0;
nsm->active = 0; nsm->active = 0;
@@ -179,7 +179,7 @@ nsm_new ( void )
/* CLIENT TO SERVER INFORMATIONAL MESSAGES */ /* CLIENT TO SERVER INFORMATIONAL MESSAGES */
/*******************************************/ /*******************************************/


NSM_EXPORT
NSM_EXPORT
void void
nsm_send_is_dirty ( nsm_client_t *nsm ) nsm_send_is_dirty ( nsm_client_t *nsm )
{ {
@@ -187,7 +187,7 @@ nsm_send_is_dirty ( nsm_client_t *nsm )
lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/is_dirty", "" ); lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/is_dirty", "" );
} }


NSM_EXPORT
NSM_EXPORT
void void
nsm_send_is_clean ( nsm_client_t *nsm ) nsm_send_is_clean ( nsm_client_t *nsm )
{ {
@@ -195,7 +195,7 @@ nsm_send_is_clean ( nsm_client_t *nsm )
lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/is_clean", "" ); lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/is_clean", "" );
} }


NSM_EXPORT
NSM_EXPORT
void void
nsm_send_progress ( nsm_client_t *nsm, float p ) nsm_send_progress ( nsm_client_t *nsm, float p )
{ {
@@ -203,7 +203,7 @@ nsm_send_progress ( nsm_client_t *nsm, float p )
lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/progress", "f", p ); lo_send_from( _NSM()->nsm_addr, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/client/progress", "f", p );
} }


NSM_EXPORT
NSM_EXPORT
void void
nsm_send_message ( nsm_client_t *nsm, int priority, const char *msg ) nsm_send_message ( nsm_client_t *nsm, int priority, const char *msg )
{ {
@@ -215,15 +215,15 @@ NSM_EXPORT void
nsm_send_announce ( nsm_client_t *nsm, const char *app_name, const char *capabilities, const char *process_name ) nsm_send_announce ( nsm_client_t *nsm, const char *app_name, const char *capabilities, const char *process_name )
{ {
lo_address to = lo_address_new_from_url( _NSM()->nsm_url ); lo_address to = lo_address_new_from_url( _NSM()->nsm_url );
if ( ! to ) if ( ! to )
{ {
fprintf( stderr, "NSM: Bad address!" ); fprintf( stderr, "NSM: Bad address!" );
return; return;
} }
int pid = (int)getpid(); int pid = (int)getpid();
lo_send_from( to, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/server/announce", "sssiii", lo_send_from( to, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/server/announce", "sssiii",
app_name, app_name,
capabilities, capabilities,
@@ -231,11 +231,11 @@ nsm_send_announce ( nsm_client_t *nsm, const char *app_name, const char *capabil
NSM_API_VERSION_MAJOR, NSM_API_VERSION_MAJOR,
NSM_API_VERSION_MINOR, NSM_API_VERSION_MINOR,
pid ); pid );
lo_address_free( to ); lo_address_free( to );
} }


NSM_EXPORT void
NSM_EXPORT void
nsm_send_broadcast ( nsm_client_t *nsm, lo_message msg ) nsm_send_broadcast ( nsm_client_t *nsm, lo_message msg )
{ {
if ( _NSM()->nsm_is_active ) if ( _NSM()->nsm_is_active )
@@ -282,12 +282,12 @@ nsm_free ( nsm_client_t *nsm )
{ {
if ( _NSM()->_st ) if ( _NSM()->_st )
nsm_thread_stop( nsm ); nsm_thread_stop( nsm );
if ( _NSM()->_st ) if ( _NSM()->_st )
lo_server_thread_free( _NSM()->_st ); lo_server_thread_free( _NSM()->_st );
else else
lo_server_free( _NSM()->_server ); lo_server_free( _NSM()->_server );
free( _NSM() ); free( _NSM() );
} }


@@ -309,7 +309,7 @@ nsm_set_save_callback( nsm_client_t *nsm, nsm_save_callback *save_callback, void
{ {
_NSM()->save = save_callback; _NSM()->save = save_callback;
_NSM()->save_userdata = userdata; _NSM()->save_userdata = userdata;
} }


NSM_EXPORT NSM_EXPORT
@@ -358,24 +358,24 @@ NSM_EXPORT int _nsm_osc_open ( const char *path, const char *types, lo_arg **arg
(void) msg; (void) msg;


char *out_msg = NULL; char *out_msg = NULL;
struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data; struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data;
nsm->nsm_client_id = strdup( &argv[2]->s ); nsm->nsm_client_id = strdup( &argv[2]->s );
if ( ! nsm->open ) if ( ! nsm->open )
return 0; return 0;


int r = nsm->open( &argv[0]->s, &argv[1]->s, &argv[2]->s, &out_msg, nsm->open_userdata ); int r = nsm->open( &argv[0]->s, &argv[1]->s, &argv[2]->s, &out_msg, nsm->open_userdata );
if ( r ) if ( r )
OSC_REPLY_ERR( r, ( out_msg ? out_msg : "") ); OSC_REPLY_ERR( r, ( out_msg ? out_msg : "") );
else else
OSC_REPLY( "OK" ); OSC_REPLY( "OK" );
if ( out_msg ) if ( out_msg )
free( out_msg ); free( out_msg );
return 0; return 0;
} }


@@ -387,22 +387,22 @@ NSM_EXPORT int _nsm_osc_save ( const char *path, const char *types, lo_arg **arg
(void) msg; (void) msg;


char *out_msg = NULL; char *out_msg = NULL;
struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data; struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data;


if ( ! nsm->save ) if ( ! nsm->save )
return 0; return 0;


int r = nsm->save(&out_msg, nsm->save_userdata ); int r = nsm->save(&out_msg, nsm->save_userdata );
if ( r ) if ( r )
OSC_REPLY_ERR( r, ( out_msg ? out_msg : "") ); OSC_REPLY_ERR( r, ( out_msg ? out_msg : "") );
else else
OSC_REPLY( "OK" ); OSC_REPLY( "OK" );
if ( out_msg ) if ( out_msg )
free( out_msg ); free( out_msg );
return 0; return 0;
} }


@@ -414,18 +414,18 @@ NSM_EXPORT int _nsm_osc_announce_reply ( const char *path, const char *types, lo


if ( strcmp( &argv[0]->s, "/nsm/server/announce" ) ) if ( strcmp( &argv[0]->s, "/nsm/server/announce" ) )
return -1; return -1;
struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data; struct _nsm_client_t *nsm = (struct _nsm_client_t*)user_data;


fprintf( stderr, "NSM: Successfully registered. NSM says: %s", &argv[1]->s ); fprintf( stderr, "NSM: Successfully registered. NSM says: %s", &argv[1]->s );


nsm->nsm_is_active = 1; nsm->nsm_is_active = 1;
nsm->_session_manager_name = strdup( &argv[2]->s ); nsm->_session_manager_name = strdup( &argv[2]->s );
nsm->nsm_addr = lo_address_new_from_url( lo_address_get_url( lo_message_get_source( msg ) ));
nsm->nsm_addr = lo_address_new_from_url( lo_address_get_url( lo_message_get_source( msg ) ));
if ( nsm->active ) if ( nsm->active )
nsm->active( nsm->nsm_is_active, nsm->active_userdata ); nsm->active( nsm->nsm_is_active, nsm->active_userdata );
return 0; return 0;
} }


@@ -444,7 +444,7 @@ NSM_EXPORT int _nsm_osc_error ( const char *path, const char *types, lo_arg **ar
fprintf( stderr, "NSM: Failed to register with NSM server: %s", &argv[2]->s ); fprintf( stderr, "NSM: Failed to register with NSM server: %s", &argv[2]->s );


nsm->nsm_is_active = 0; nsm->nsm_is_active = 0;
if ( nsm->active ) if ( nsm->active )
nsm->active( nsm->nsm_is_active, nsm->active_userdata ); nsm->active( nsm->nsm_is_active, nsm->active_userdata );


@@ -463,7 +463,7 @@ NSM_EXPORT int _nsm_osc_session_is_loaded ( const char *path, const char *types,


if ( ! nsm->session_is_loaded ) if ( ! nsm->session_is_loaded )
return 0; return 0;
nsm->session_is_loaded( nsm->session_is_loaded_userdata ); nsm->session_is_loaded( nsm->session_is_loaded_userdata );


return 0; return 0;
@@ -479,7 +479,7 @@ NSM_EXPORT int _nsm_osc_broadcast ( const char *path, const char *types, lo_arg


if ( ! nsm->broadcast ) if ( ! nsm->broadcast )
return 0; return 0;
return nsm->broadcast( path, msg, nsm->broadcast_userdata ); return nsm->broadcast( path, msg, nsm->broadcast_userdata );
} }


@@ -523,7 +523,7 @@ nsm_init_thread ( nsm_client_t *nsm, const char *nsm_url )


_NSM()->_st = lo_server_thread_new_with_proto( NULL, proto, NULL ); _NSM()->_st = lo_server_thread_new_with_proto( NULL, proto, NULL );
_NSM()->_server = lo_server_thread_get_server( _NSM()->_st ); _NSM()->_server = lo_server_thread_get_server( _NSM()->_st );
if ( ! _NSM()->_server ) if ( ! _NSM()->_server )
return -1; return -1;




+ 155
- 153
src/nsmd.cpp
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save