Merge branch 'enable-logging-diag'

* Branch commit log:
  .pre-commit-config.yaml: fix whitespace
  .github/workflows/*.yml: untabify yaml
  ase/engine.cc: use diag() (not warning) to allow tests without audio output
  ase/logging.cc: support ASE_DEBUG={all|trace|diag} for logging

Signed-off-by: Tim Janik <timj@gnu.org>

Author: tim-janik

.github/workflows/pages.yml

@@ -7,8 +7,8 @@
 name: Deploy mkdocs site to Pages
 
 on:
-  workflow_dispatch:		# Allow to run this workflow manually from the Actions tab
-  push:	{ branches: ["trunk"] }	# Run on pushes targeting the default branch
+  workflow_dispatch:            # Allow to run this workflow manually from the Actions tab
+  push: { branches: ["trunk"] } # Run on pushes targeting the default branch
 # Set permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions: { contents: read, pages: write, id-token: write }
 
@@ -23,7 +23,7 @@ jobs:
     container: { image: 'ghcr.io/tim-janik/anklang-ci:ci-latest', options: --user runner }
     steps:
     - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-    - run: git fetch -f --tags	# Fix actions/checkout#290
+    - run: git fetch -f --tags  # Fix actions/checkout#290
     - uses: actions/configure-pages@v5
     - name: 'Configure build presets'
       run: |

.github/workflows/testing.yml

@@ -16,7 +16,7 @@ jobs:
     container: { image: 'ghcr.io/tim-janik/anklang-ci:ci-latest', options: --user runner }
     steps:
     - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-    - run: git fetch -f --tags	# Fix actions/checkout#290
+    - run: git fetch -f --tags  # Fix actions/checkout#290
     - run: |
         make -w dist
         mkdir /tmp/anklang && tar xf artifacts/anklang-*.tar.zst -C /tmp/anklang --strip-components=1
@@ -54,7 +54,7 @@ jobs:
     container: { image: 'ghcr.io/tim-janik/anklang-ci:ci-latest', options: --user runner }
     steps:
     - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-    - run: git fetch -f --tags	# Fix actions/checkout#290
+    - run: git fetch -f --tags  # Fix actions/checkout#290
     - run: git describe --always --long
     - name: 'Configure build presets'
       run: |
@@ -81,11 +81,11 @@ jobs:
   #  container: { image: 'ghcr.io/tim-janik/anklang-ci:arch-latest' }
   #  steps:
   #  - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-  #  - run: git fetch -f --tags	# Fix actions/checkout#290
+  #  - run: git fetch -f --tags # Fix actions/checkout#290
   #  - run: git describe --always --long
   #  - name: 'Configure build presets'
   #    run: |
-  #      echo 'prefix=/' > config-defaults.mk	;# reset any previous config-defaults.mk
+  #      echo 'prefix=/' > config-defaults.mk   ;# reset any previous config-defaults.mk
   #  - name: 'Build Anklang'
   #    run: |
   #      make GCC_COLORS="" -j`nproc` all
@@ -103,13 +103,13 @@ jobs:
   CreateRelease:
     runs-on: ubuntu-latest
     needs: [ ReleaseArtifacts ]
-    if: github.ref_type == 'tag'	# https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+    if: github.ref_type == 'tag'        # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
     # https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions: { contents: write }	# allow github.token to create a release
+    permissions: { contents: write }    # allow github.token to create a release
     env: { GH_TOKEN: "${{ github.token }}" }
     steps:
     - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-    - run: git fetch -f --tags	# Fix actions/checkout#290
+    - run: git fetch -f --tags  # Fix actions/checkout#290
     - uses: actions/download-artifact@v4
       with: { path: ./artifacts, merge-multiple: true }
     - run: ls -alR artifacts/
@@ -122,7 +122,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - { uses: actions/checkout@v4, with: { fetch-depth: 0 } }
-    - run: git fetch -f --tags	# Fix actions/checkout#290
+    - run: git fetch -f --tags  # Fix actions/checkout#290
     - name: Check-Jobs
       run: |
         echo '${{ needs.ReleaseArtifacts.result }}' '${{ needs.CreateRelease.result }}' '${{ needs.NobleClangTidy.result }}'

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # This Source Code Form is licensed MPL-2.0: http://mozilla.org/MPL/2.0
 
 # See https://pre-commit.com for more information
-default_stages: [pre-push]	# only run on push
+default_stages: [pre-push]      # only run on push
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v6.0.0
@@ -33,7 +33,7 @@ repos:
     name: Check Unfinished Work
     entry: misc/check-unfinished.sh
     language: system
-    types: [file]	# Run for all file types
+    types: [file]       # Run for all file types
     pass_filenames: true
     exclude: |
       (?x)^(

ase/engine.cc

@@ -735,7 +735,7 @@ AudioEngine::update_drivers (const String &pcm_name, uint latency_ms, const Stri
                       PcmDriver::open (dset.pcm_name, Driver::WRITEONLY, Driver::WRITEONLY, pcm_config, &er);
     if (!dset.pcm_driver || er != 0) {
       dset.pcm_driver = dset.null_pcm_driver;
-      warning ("Audio Driver: Failed to open audio device: %s: %s", dset.pcm_name, ase_error_blurb (er));
+      diag ("Audio Driver: Failed to open audio device: %s: %s", dset.pcm_name, ase_error_blurb (er));
       const String errmsg = string_format ("# Audio I/O Error\n" "Failed to open audio device:\n" "%s:\n" "%s",
                                            dset.pcm_name, ase_error_blurb (er));
       engine_thread.queue_user_note ("driver.pcm", UserNote::CLEAR, errmsg);

ase/logging.cc

@@ -168,8 +168,17 @@ bool
 logging_configure (bool to_file, Logging level)
 {
   logging_level = level;
-  if (logging_level < FATAL)
-    logging_level = parse_log_level (rfind_debug_value (getenv_ase_debug(), "loglevel", ""), INFO);
+  if (logging_level < FATAL) {
+    // ASE_DEBUG={all|trace|diag|loglevel=<level>} for logging
+    if (strcmp ("0", rfind_debug_value (getenv_ase_debug(), "all", "0")) != 0)
+      logging_level = TRACE;
+    else if (strcmp ("0", rfind_debug_value (getenv_ase_debug(), "trace", "0")) != 0)
+      logging_level = TRACE;
+    else if (strcmp ("0", rfind_debug_value (getenv_ase_debug(), "diag", "0")) != 0)
+      logging_level = DIAG;
+    else
+      logging_level = parse_log_level (rfind_debug_value (getenv_ase_debug(), "loglevel", ""), INFO);
+  }
   loging_setup();
   if (!to_file) {
     std::lock_guard<std::mutex> locker (logging_buffer_mutex);