From 2722f6585456d77f19f81bc6bf4326c30cf75158 Mon Sep 17 00:00:00 2001 From: Nils <> Date: Sat, 26 Dec 2020 17:03:45 +0100 Subject: [PATCH] regenerate documentation --- README.md | 8 +--- docs/api/index.html | 78 +++++++++++++++++++++++++++++----- docs/index.html | 6 +-- docs/src/index.adoc | 2 +- docs/src/jackpatch.1 | 4 +- docs/src/non-session-manager.1 | 4 +- docs/src/nsm-legacy-gui.1 | 4 +- docs/src/nsm-proxy-gui.1 | 4 +- docs/src/nsm-proxy.1 | 4 +- docs/src/nsmd.1 | 7 ++- meson.build | 2 +- 11 files changed, 89 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index ed6dcee..8d9007f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,5 @@ # New Session Manager -Quick Links: -* API Specifications - * https://linuxaudio.github.io/new-session-manager/api/index.html -* WIKI with supported clients and information how to build NSM-capability into your own program - * https://github.com/linuxaudio/new-session-manager/wiki - ## Introduction New Session Manager (NSM) is a tool to assist music production by grouping standalone programs into sessions. @@ -71,7 +65,7 @@ which was released under the GNU GENERAL PUBLIC LICENSE Version 2, June 1991. All files, except nsm.h kept in this fork were GPL "version 2 of the License, or (at your option) any later version." -`extras/nsm.h/nsm.h` is licensed under the ISC License. +`nsm.h` is licensed under the ISC License. New-Session-Manager changed the license to GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007. See file COPYING diff --git a/docs/api/index.html b/docs/api/index.html index eef355c..12b2ed8 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -443,7 +443,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

New Session Manager - API

Jonathan Moore Liles, Nils Hilbricht
-version API 1.1.0 +version API 1.1.1
License CC-By-SA v2.5
@@ -465,6 +465,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b @@ -519,6 +524,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b @@ -578,9 +584,15 @@ and are therefore out of scope for this document.

However, the same server-side API can also be implemented by other programs (such as Carla), although consistency and robustness will likely suffer if non-NSM compliant clients are allowed to -participate in a session. There is no direct dependency for client implementations, as long as they -can send and receive OSC. Some clients use liblo (the OSC library), which becomes a dependency if -you choose to implement NSM-support with the provided header file nsm.h.

+participate in a session.

+
+
+

There is no direct dependency for client implementations, as long as they +can send and receive OSC. +Some clients use liblo (the OSC library), which becomes a dependency if you choose to implement +NSM-support with the provided header file nsm.h (extras/nsm.h/nsm.h in the git repository). +Some clients use the provided single-file python library pynsm (extras/pynsm/nsmclient.py in the git repository) +which has no dependencies outside the Python3 standard library.

The aim of this project is to thoroughly define the behavior required of clients. Often the @@ -691,6 +703,30 @@ session. The symlinks thus created should, at the very least, be named after the to. Some unique component may be required to prevent collisions.

+
+

1.2.3. Session Root and Session Directories

+
+
1.2.3.1. Subdirectories / Hierarchical Structure
+
+

Subdirectories MAY be made to organize sessions into meaningful structures, such as album/track or +composer/genre/piece. For example: Johann Sebastian Bach/Kantaten/Wie schön leuchtet der Morgenstern. +Which results in the same directory structure on disk. Session names can contain any characters that +are supported by the underlying file system, usually UTF-8.

+
+
+

Subdirectories are created by either nsmd itself or by the users themselves, through their file +manager or a GUI (while the session is not open).

+
+
+

The project_name from /nsm/server/new s:project_name accepts the format a/b/c/d.

+
+
+

Any session itself MUST be a "leaf" in this directory tree. A session MUST NOT contain further +session subdirectories: any directory that contains a file session.nsm is the final +element in the hierarchy.

+
+
+
@@ -831,7 +867,7 @@ the user.

optional-gui

-

server responds to optional-gui messages. If this capability is not present then clients with optional-guis MUST always keep them visible

+

server responds to optional-gui messages. This capability is always present and MUST be supported by any server implementation.

@@ -1589,15 +1625,15 @@ PATCH version when you make backwards compatible bug fixes.

New Session Manager

-

1.4.0

+

1.5.0

New Session Manager API

-

1.1.0 NEW nsmd.cpp

+

1.1.1 NEW nsmd.cpp

New API Document

-

1.4.0 Here

+

1.5.0 Here

@@ -1736,13 +1772,35 @@ non-session-manager git.

+
+

3.3. Changes in API Version 1.1.1

+
+ +
+
diff --git a/docs/index.html b/docs/index.html index 5a5e027..607eea4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -443,7 +443,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

New Session Manager Documentation

LinuxAudio.org
-version 1.4.0 +version 1.5.0
@@ -557,8 +557,8 @@ Documentation and tutorials for software-developers will be added at a later dat
diff --git a/docs/src/index.adoc b/docs/src/index.adoc index faa3f4f..a0e7aba 100644 --- a/docs/src/index.adoc +++ b/docs/src/index.adoc @@ -14,7 +14,7 @@ A copy of the license has been provided in the file documentation/LICENSE. :Author: LinuxAudio.org :iconfont-remote!: :!webfonts: -:revnumber: 1.4.0 +:revnumber: 1.5.0 = New Session Manager Documentation diff --git a/docs/src/jackpatch.1 b/docs/src/jackpatch.1 index 60970f3..e221072 100644 --- a/docs/src/jackpatch.1 +++ b/docs/src/jackpatch.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH JACKPATCH "1" "December 2020" "jackpatch Version 1.4.0" "User Commands" +.TH JACKPATCH "1" "December 2020" "jackpatch Version 1.5.0" "User Commands" .SH NAME -jackpatch \- manual page for jackpatch Version 1.4.0 +jackpatch \- manual page for jackpatch Version 1.5.0 .SH DESCRIPTION jackpatch \- Remember the JACK Audio Connection Kit Graph in NSM .PP diff --git a/docs/src/non-session-manager.1 b/docs/src/non-session-manager.1 index d798993..d671dc4 100644 --- a/docs/src/non-session-manager.1 +++ b/docs/src/non-session-manager.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NSM-LEGACY-GUI "1" "December 2020" "nsm-legacy-gui Version 1.4.0" "User Commands" +.TH NSM-LEGACY-GUI "1" "December 2020" "nsm-legacy-gui Version 1.5.0" "User Commands" .SH NAME -nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.4.0 +nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.5.0 .SH DESCRIPTION nsm\-legacy\-gui \- FLTK GUI for the 'New Session Manager' .SS "Usage:" diff --git a/docs/src/nsm-legacy-gui.1 b/docs/src/nsm-legacy-gui.1 index d798993..d671dc4 100644 --- a/docs/src/nsm-legacy-gui.1 +++ b/docs/src/nsm-legacy-gui.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NSM-LEGACY-GUI "1" "December 2020" "nsm-legacy-gui Version 1.4.0" "User Commands" +.TH NSM-LEGACY-GUI "1" "December 2020" "nsm-legacy-gui Version 1.5.0" "User Commands" .SH NAME -nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.4.0 +nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.5.0 .SH DESCRIPTION nsm\-legacy\-gui \- FLTK GUI for the 'New Session Manager' .SS "Usage:" diff --git a/docs/src/nsm-proxy-gui.1 b/docs/src/nsm-proxy-gui.1 index 108e7d5..31229be 100644 --- a/docs/src/nsm-proxy-gui.1 +++ b/docs/src/nsm-proxy-gui.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NSM-PROXY-GUI "1" "December 2020" "nsm-proxy-gui Version 1.4.0" "User Commands" +.TH NSM-PROXY-GUI "1" "December 2020" "nsm-proxy-gui Version 1.5.0" "User Commands" .SH NAME -nsm-proxy-gui \- manual page for nsm-proxy-gui Version 1.4.0 +nsm-proxy-gui \- manual page for nsm-proxy-gui Version 1.5.0 .SH DESCRIPTION nsm\-proxy\-gui \- GUI for nsm\-proxy, a wrapper for executables without direct NSM\-Support. .SS "Usage:" diff --git a/docs/src/nsm-proxy.1 b/docs/src/nsm-proxy.1 index beee2bd..f1d0580 100644 --- a/docs/src/nsm-proxy.1 +++ b/docs/src/nsm-proxy.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NSM-PROXY "1" "December 2020" "nsm-proxy Version 1.4.0" "User Commands" +.TH NSM-PROXY "1" "December 2020" "nsm-proxy Version 1.5.0" "User Commands" .SH NAME -nsm-proxy \- manual page for nsm-proxy Version 1.4.0 +nsm-proxy \- manual page for nsm-proxy Version 1.5.0 .SH DESCRIPTION nsm\-proxy \- Wrapper for executables without direct NSM\-Support. .PP diff --git a/docs/src/nsmd.1 b/docs/src/nsmd.1 index a21e502..a3784d1 100644 --- a/docs/src/nsmd.1 +++ b/docs/src/nsmd.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NSMD "1" "December 2020" "nsmd Version 1.4.0" "User Commands" +.TH NSMD "1" "December 2020" "nsmd Version 1.5.0" "User Commands" .SH NAME -nsmd \- manual page for nsmd Version 1.4.0 +nsmd \- manual page for nsmd Version 1.5.0 .SH DESCRIPTION nsmd \- Daemon and server for the 'New Session Manager' .SS "Usage:" @@ -31,6 +31,9 @@ Connect to running legacy\-gui [Example: osc.udp://mycomputer.localdomain:38356/ .TP \fB\-\-detach\fR Detach from console. +.TP +\fB\-\-quiet\fR +Suppress messages except warnings and errors. .PP nsmd can be run headless with existing sessions. To create new ones it is recommended to use a GUI such as nsm\-legacy\-gui (included) or Agordejo (separate package) diff --git a/meson.build b/meson.build index 7f14834..e2f5afc 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ project( 'new-session-manager', 'c', 'cpp', -version : '1.4.0', +version : '1.5.0', license : 'GPLv3', )