Skip to content

Comments

#2975 Headless _builds_ use fewer libraries#3117

Merged
pljones merged 1 commit intojamulussoftware:mainfrom
pljones:patch/omit-gui-acknowledgements-from-headless-startup-log
Sep 18, 2023
Merged

#2975 Headless _builds_ use fewer libraries#3117
pljones merged 1 commit intojamulussoftware:mainfrom
pljones:patch/omit-gui-acknowledgements-from-headless-startup-log

Conversation

@pljones
Copy link
Collaborator

@pljones pljones commented Jul 29, 2023 •
edited
Loading

Short description of changes

  1. Removes acknowledgements for libraries not used when CONFIG+="headless" is used
  2. Reorganise GUI acknowledgements to be more consistent
  3. Add some additional translation (using existing strings) to non-GUI start up log

CHANGELOG: Client/Server: Improved start up logging

Context: Fixes an issue?

Fixes: 2975

Does this change need documentation? What needs to be documented and how?

Possibly there are examples of start up that might change. Needs checking.

Status of this Pull Request

Tested locally:

Non-headless build:

  1. GUI client:
$ ./Jamulus
- allocated port number: 22134
Connecting to JACK "default" instance (use the JACK_DEFAULT_SERVER environment variable to change this).
  1. Non-GUI client:
$ ./Jamulus -n
- no GUI mode chosen
- allocated port number: 22134
Connecting to JACK "default" instance (use the JACK_DEFAULT_SERVER environment variable to change this).
 *** Jamulus, Version 3.9.1dev-2260dc49-dirty
 *** Internet Jam Session Software
 *** Released under the GNU General Public License version 2 or later (GPLv2)
 *** <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
 ***
 *** 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.
 *** There is NO WARRANTY, to the extent permitted by law.
 ***
 *** This app uses the following libraries, resources or code snippets:
 ***
 *** Qt cross-platform application framework 6.5.2
 *** <https://www.qt.io>
 ***
 *** Opus Interactive Audio Codec
 *** <https://www.opus-codec.org>
 ***
 *** Audio reverberation code by Perry R. Cook and Gary P. Scavone, 1995 - 2021, The Synthesis ToolKit in C++ (STK)
 *** <https://ccrma.stanford.edu/software/stk>
 ***
 *** Some pixmaps are from the Open Clip Art Library (OCAL)
 *** <https://openclipart.org>
 ***
 *** Flag icons by Mark James
 *** <http://www.famfamfam.com>
 ***
 *** Some sound samples are from Freesound
 *** <https://freesound.org>
 ***
 *** Copyright © 2005-2023 The Jamulus Development Team
  1. GUI server:
$ ./Jamulus -s -p 60000
- server mode chosen
- selected port number: 60000
Using "192.168.1.19" as external IP.
Recording state not initialised
Recording state: enabled
  1. Non-GUI server:
$ ./Jamulus -s -p 60000 -n
- server mode chosen
- selected port number: 60000
- no GUI mode chosen
Using "192.168.1.19" as external IP.
Recording state not initialised
 *** Jamulus, Version 3.9.1dev-2260dc49-dirty
 *** Internet Jam Session Software
 *** Released under the GNU General Public License version 2 or later (GPLv2)
 *** <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
 ***
 *** 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.
 *** There is NO WARRANTY, to the extent permitted by law.
 ***
 *** This app uses the following libraries, resources or code snippets:
 ***
 *** Qt cross-platform application framework 6.5.2
 *** <https://www.qt.io>
 ***
 *** Opus Interactive Audio Codec
 *** <https://www.opus-codec.org>
 ***
 *** Audio reverberation code by Perry R. Cook and Gary P. Scavone, 1995 - 2021, The Synthesis ToolKit in C++ (STK)
 *** <https://ccrma.stanford.edu/software/stk>
 ***
 *** Some pixmaps are from the Open Clip Art Library (OCAL)
 *** <https://openclipart.org>
 ***
 *** Flag icons by Mark James
 *** <http://www.famfamfam.com>
 ***
 *** Some sound samples are from Freesound
 *** <https://freesound.org>
 ***
 *** Copyright © 2005-2023 The Jamulus Development Team

Headless build:

  1. GUI / non-GUI client:
$ ./Jamulus
No GUI support compiled. Running in headless mode.
- allocated port number: 22134
Connecting to JACK "default" instance (use the JACK_DEFAULT_SERVER environment variable to change this).
 *** Jamulus, Version 3.9.1dev-d857b04f
 *** Internet Jam Session Software
 *** Released under the GNU General Public License version 2 or later (GPLv2)
 *** <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
 ***
 *** 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.
 *** There is NO WARRANTY, to the extent permitted by law.
 ***
 *** This app uses the following libraries, resources or code snippets:
 ***
 *** Qt cross-platform application framework 6.5.2
 *** <https://www.qt.io>
 ***
 *** Opus Interactive Audio Codec
 *** <https://www.opus-codec.org>
 ***
 *** Audio reverberation code by Perry R. Cook and Gary P. Scavone, 1995 - 2021, The Synthesis ToolKit in C++ (STK)
 *** <https://ccrma.stanford.edu/software/stk>
 ***
 *** Copyright © 2005-2023 The Jamulus Development Team
  1. GUI / non-GUI server
$ ./Jamulus -s -p 60000
- server mode chosen
- selected port number: 60000
No GUI support compiled. Running in headless mode.
Using "192.168.1.19" as external IP.
Recording state not initialised
 *** Jamulus, Version 3.9.1dev-d857b04f
 *** Internet Jam Session Software
 *** Released under the GNU General Public License version 2 or later (GPLv2)
 *** <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
 ***
 *** 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.
 *** There is NO WARRANTY, to the extent permitted by law.
 ***
 *** This app uses the following libraries, resources or code snippets:
 ***
 *** Qt cross-platform application framework 6.5.2
 *** <https://www.qt.io>
 ***
 *** Opus Interactive Audio Codec
 *** <https://www.opus-codec.org>
 ***
 *** Audio reverberation code by Perry R. Cook and Gary P. Scavone, 1995 - 2021, The Synthesis ToolKit in C++ (STK)
 *** <https://ccrma.stanford.edu/software/stk>
 ***
 *** Copyright © 2005-2023 The Jamulus Development Team

The removed section reads:

 *** Audio reverberation code by Perry R. Cook and Gary P. Scavone, 1995 - 2021, The Synthesis ToolKit in C++ (STK)
 *** <https://ccrma.stanford.edu/software/stk>
 ***
 *** Some pixmaps are from the Open Clip Art Library (OCAL)
 *** <https://openclipart.org>
 ***
 *** Flag icons by Mark James
 *** <http://www.famfamfam.com>
 ***
 *** Some sound samples are from Freesound
 *** <https://freesound.org>
 ***

What is missing until this pull request can be merged?

  • Review
  • Check translated versions??

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@pljones pljones added this to the Release 3.11.0 milestone Jul 29, 2023
@pljones pljones linked an issue Jul 29, 2023 that may be closed by this pull request
Start up logging for headless server #2975
Closed
@pljones pljones self-assigned this Jul 29, 2023
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch 3 times, most recently from 674f97e to 61bbf15 Compare August 1, 2023 17:34
@pljones pljones changed the title 2975 Headless _builds_ use fewer libraries #2975 Headless _builds_ use fewer libraries Aug 1, 2023
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch from 61bbf15 to ca03b6e Compare August 3, 2023 18:34
@pljones pljones added the refactoring Non-behavioural changes, Code cleanup label Aug 10, 2023
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch from ca03b6e to ef6210c Compare August 15, 2023 16:15
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch 4 times, most recently from ea8bac9 to fd8fe18 Compare August 28, 2023 12:32
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch 2 times, most recently from 8dd202e to e438c70 Compare September 12, 2023 16:19
ann0see
ann0see approved these changes Sep 14, 2023
View reviewed changes
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you tested it, and the code seems ok, approving

ann0see
ann0see reviewed Sep 14, 2023
View reviewed changes
ann0see
ann0see reviewed Sep 14, 2023
View reviewed changes
@pljones pljones force-pushed the patch/omit-gui-acknowledgements-from-headless-startup-log branch from e438c70 to 1a84370 Compare September 16, 2023 10:34
ann0see
ann0see reviewed Sep 17, 2023
View reviewed changes
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good.

@pljones pljones merged commit ab0dfff into jamulussoftware:main Sep 18, 2023
@pljones pljones deleted the patch/omit-gui-acknowledgements-from-headless-startup-log branch September 18, 2023 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ann0see ann0see ann0see approved these changes

Assignees

@pljones pljones

Labels

refactoring Non-behavioural changes, Code cleanup

Projects

Tracking
Status: Done

Milestone

Release 3.11.0

Development

Successfully merging this pull request may close these issues.

Start up logging for headless server

2 participants

@pljones @ann0see