revoxx 1.0.1__tar.gz → 1.1.0__tar.gz

{revoxx-1.0.1/revoxx.egg-info → revoxx-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: revoxx
-Version: 1.0.1
+Version: 1.1.0
 Summary: Speech recording application for creating high-quality speech datasets
 Author-email: Grammatek ehf <info@grammatek.com>
 Maintainer-email: Grammatek ehf <info@grammatek.com>
@@ -38,7 +38,7 @@ Requires-Dist: torch>=2.0.0; extra == "vad"
 Requires-Dist: silero-vad>=5.0; extra == "vad"
 Requires-Dist: torchaudio<2.8.0; extra == "vad"
 Provides-Extra: dev
-Requires-Dist: black>=22.0.0; extra == "dev"
+Requires-Dist: black<26,>=25.0.0; extra == "dev"
 Requires-Dist: isort>=5.10.0; extra == "dev"
 Requires-Dist: flake8>=6.0.0; extra == "dev"
 Requires-Dist: pytest>=7.0.0; extra == "dev"
@@ -50,14 +50,14 @@ Dynamic: license-file
 
 This repository provides **Revoxx**, a graphical recording application for recording raw speech and generating datasets.
 
-![Version](https://img.shields.io/badge/Version-main-darkgreen)
+[![PyPI version](https://img.shields.io/pypi/v/revoxx)](https://pypi.org/project/revoxx/)
 ![Python](https://img.shields.io/badge/python-3.9-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.10-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.11-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.12-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.13-blue?logo=python&logoColor=white)
 [![CI Status](https://github.com/icelandic-lt/revoxx/actions/workflows/build.yml/badge.svg)](https://github.com/icelandic-lt/revoxx/actions/workflows/build.yml)
-![Docker](https://img.shields.io/badge/Docker-[unavailable]-red)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/icelandic-lt/revoxx)
 
 ## Overview
 
@@ -114,6 +114,12 @@ the Icelandic emotional speech dataset, and created this tool to minimize hassle
 - **Real-time monitoring** including toggable recording levels, mel spectrograms, maximum frequency detection, and more
   - Customizable **industry-standard presets for Peak/RMS levels**
   - Dedicated **Monitoring mode** for precise input calibration
+- **Audio Editing** directly in the spectrogram view
+  - Set position markers to play from any point in the recording
+  - Create selection ranges for partial playback
+  - Delete ranges with automatic crossfade
+  - Insert new audio at marker position
+  - Replace selected ranges with new recordings
 - **Multi-Screen Support**
   - You can use multiple monitors to **separate recording view from speaker view**
   - We support Apple's [Sidecar](https://support.apple.com/en-us/102597) feature for a **convenient dual screen setup with an external iPad**
@@ -244,12 +250,14 @@ pip install -e .[dev,vad]
 ```
 
 Development dependencies include:
-- **black**: Code formatter
+- **black**: Code formatter (pinned to 25.x for Python 3.9 compatibility)
 - **isort**: Import statement organizer
 - **flake8**: Code linter
 - **pytest**: Testing framework
 - **pytest-cov**: Code coverage reporting
 
+> **Note**: Black is pinned to version 25.x because Black 26+ requires Python 3.10+ and introduces the "2026 stable style" with different formatting rules. This ensures consistent formatting across all supported Python versions (3.9-3.13).
+
 ### Running code quality checks
 
 ```bash
@@ -315,7 +323,7 @@ revoxx --session path/to/session # Open specific session
 
 ## Usage
 
-For a guide on using Revoxx, please see the [User Guide](https://github.com/icelandic-lt/revoxx/blob/main/doc/USER_GUIDE.md).
+For a guide on using Revoxx, please see the [User Guide](https://github.com/icelandic-lt/revoxx/blob/main/revoxx/doc/USER_GUIDE.md).
 
 ## Prepare recordings
 

{revoxx-1.0.1 → revoxx-1.1.0}/README.md

@@ -2,14 +2,14 @@
 
 This repository provides **Revoxx**, a graphical recording application for recording raw speech and generating datasets.
 
-![Version](https://img.shields.io/badge/Version-main-darkgreen)
+[![PyPI version](https://img.shields.io/pypi/v/revoxx)](https://pypi.org/project/revoxx/)
 ![Python](https://img.shields.io/badge/python-3.9-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.10-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.11-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.12-blue?logo=python&logoColor=white)
 ![Python](https://img.shields.io/badge/python-3.13-blue?logo=python&logoColor=white)
 [![CI Status](https://github.com/icelandic-lt/revoxx/actions/workflows/build.yml/badge.svg)](https://github.com/icelandic-lt/revoxx/actions/workflows/build.yml)
-![Docker](https://img.shields.io/badge/Docker-[unavailable]-red)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/icelandic-lt/revoxx)
 
 ## Overview
 
@@ -66,6 +66,12 @@ the Icelandic emotional speech dataset, and created this tool to minimize hassle
 - **Real-time monitoring** including toggable recording levels, mel spectrograms, maximum frequency detection, and more
   - Customizable **industry-standard presets for Peak/RMS levels**
   - Dedicated **Monitoring mode** for precise input calibration
+- **Audio Editing** directly in the spectrogram view
+  - Set position markers to play from any point in the recording
+  - Create selection ranges for partial playback
+  - Delete ranges with automatic crossfade
+  - Insert new audio at marker position
+  - Replace selected ranges with new recordings
 - **Multi-Screen Support**
   - You can use multiple monitors to **separate recording view from speaker view**
   - We support Apple's [Sidecar](https://support.apple.com/en-us/102597) feature for a **convenient dual screen setup with an external iPad**
@@ -196,12 +202,14 @@ pip install -e .[dev,vad]
 ```
 
 Development dependencies include:
-- **black**: Code formatter
+- **black**: Code formatter (pinned to 25.x for Python 3.9 compatibility)
 - **isort**: Import statement organizer
 - **flake8**: Code linter
 - **pytest**: Testing framework
 - **pytest-cov**: Code coverage reporting
 
+> **Note**: Black is pinned to version 25.x because Black 26+ requires Python 3.10+ and introduces the "2026 stable style" with different formatting rules. This ensures consistent formatting across all supported Python versions (3.9-3.13).
+
 ### Running code quality checks
 
 ```bash
@@ -267,7 +275,7 @@ revoxx --session path/to/session # Open specific session
 
 ## Usage
 
-For a guide on using Revoxx, please see the [User Guide](https://github.com/icelandic-lt/revoxx/blob/main/doc/USER_GUIDE.md).
+For a guide on using Revoxx, please see the [User Guide](https://github.com/icelandic-lt/revoxx/blob/main/revoxx/doc/USER_GUIDE.md).
 
 ## Prepare recordings
 

{revoxx-1.0.1 → revoxx-1.1.0}/pyproject.toml

@@ -51,7 +51,7 @@ vad = [
 # pip install torch --index-url https://download.pytorch.org/whl/cpu
 # pip install revoxx[vad]
 dev = [
-    "black>=22.0.0",
+    "black>=25.0.0,<26",
     "isort>=5.10.0",
     "flake8>=6.0.0",
     "pytest>=7.0.0",
@@ -72,7 +72,7 @@ revoxx-vadiate = "scripts_module.vadiate:main"
 
 [tool.setuptools]
 packages = ["revoxx", "revoxx.audio", "revoxx.audio.processors", "revoxx.controllers",
-           "revoxx.dataset", "revoxx.resources", "revoxx.resources.templates",
+           "revoxx.dataset", "revoxx.doc", "revoxx.resources", "revoxx.resources.templates",
            "revoxx.session", "revoxx.ui", "revoxx.ui.dialogs", "revoxx.ui.level_meter",
            "revoxx.ui.menus", "revoxx.ui.spectrogram", "revoxx.ui.spectrogram.controllers",
            "revoxx.utils", "scripts_module"]
@@ -82,11 +82,12 @@ include-package-data = true
 revoxx = [
     "resources/*.png",
     "resources/templates/*.txt",
+    "doc/*.md",
 ]
 
 [tool.black]
 line-length = 88
-target-version = ['py39', 'py310', 'py311']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 include = '\.pyi?$'
 extend-exclude = '''
 (

{revoxx-1.0.1 → revoxx-1.1.0}/revoxx/app.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import Optional
 import traceback
 
-from .constants import KeyBindings, FileConstants, MsgType
+from .constants import KeyBindings, FileConstants, MsgType, UIConstants
 from .utils.config import RecorderConfig, load_config
 from .utils.state import AppState
 from .utils.file_manager import RecordingFileManager, ScriptFileManager
@@ -29,6 +29,7 @@ from .session import SessionManager, Session
 # Import all controllers
 from .controllers import (
     AudioController,
+    EditController,
     NavigationController,
     SessionController,
     DeviceController,
@@ -168,8 +169,6 @@ class Revoxx:
                 theme_manager.set_theme(ThemePreset.CYAN)
 
         # Refresh UI constants with theme colors
-        from .constants import UIConstants
-
         UIConstants.refresh()
 
         # Initialize WindowManager
@@ -239,6 +238,7 @@ class Revoxx:
         self.display_controller = DisplayController(self, self.window_manager)
         self.file_operations_controller = FileOperationsController(self)
         self.dialog_controller = DialogController(self)
+        self.edit_controller = EditController(self)
 
     def _populate_app_callbacks(self):
         """Populate app_callbacks dictionary with controller methods."""
@@ -308,13 +308,17 @@ class Revoxx:
         self.window.window.bind(
             f"<{KeyBindings.PLAY}>", lambda e: self.audio_controller.play_current()
         )
+        self.window.window.bind(
+            f"<{KeyBindings.STOP}>",
+            lambda e: self.audio_controller.stop_all_playback_activities(),
+        )
         self.window.window.bind(
             "<Control-d>",
-            lambda e: self.file_operations_controller.delete_current_recording(),
+            lambda e: self._handle_delete(),
         )
         self.window.window.bind(
             "<Control-D>",
-            lambda e: self.file_operations_controller.delete_current_recording(),
+            lambda e: self._handle_delete(),
         )
 
         # Navigation keys
@@ -379,7 +383,7 @@ class Revoxx:
             modifier = "Control"
         self.window.window.bind(
             f"<{modifier}-{KeyBindings.DELETE_RECORDING}>",
-            lambda e: self.file_operations_controller.delete_current_recording(),
+            lambda e: self._handle_delete(),
         )
 
         # Help and info
@@ -391,6 +395,11 @@ class Revoxx:
             lambda e: self.display_controller.toggle_info_panel(),
         )
 
+        # Clear selection with Escape
+        self.window.window.bind(
+            "<Escape>", lambda e: self._clear_spectrogram_selection()
+        )
+
         # Second window shortcuts (Shift + key)
         self.window.window.bind(
             "<Shift-M>",
@@ -594,6 +603,22 @@ class Revoxx:
         # Exit
         sys.exit(0)
 
+    def _clear_spectrogram_selection(self) -> None:
+        """Clear marker and selection in spectrogram."""
+        if self.window and self.window.mel_spectrogram:
+            self.window.mel_spectrogram.clear_selection()
+
+    def _handle_delete(self) -> None:
+        """Handle delete action - deletes selection if active, otherwise recording."""
+        if (
+            self.window
+            and self.window.mel_spectrogram
+            and self.window.mel_spectrogram.selection_state.has_selection
+        ):
+            self.edit_controller.delete_selection()
+        else:
+            self.file_operations_controller.delete_current_recording()
+
     def _toggle_fullscreen(self):
         """Toggle fullscreen mode.
         This setting is saved to the user's settings.

revoxx-1.1.0/revoxx/audio/editor.py

@@ -0,0 +1,291 @@
+"""Audio editing operations with cross-fade support.
+
+This module provides audio editing functions for deleting, inserting,
+and replacing audio segments with smooth cross-fade transitions.
+"""
+
+import numpy as np
+
+from ..constants import AudioConstants
+
+
+class AudioEditor:
+    """Provides audio editing operations with cross-fade support.
+
+    All operations use equal-power cross-fading to ensure smooth
+    transitions without audible clicks or pops.
+    """
+
+    @staticmethod
+    def delete_range(
+        audio: np.ndarray, start_sample: int, end_sample: int, sample_rate: int
+    ) -> np.ndarray:
+        """Delete a range of audio samples with cross-fade.
+
+        Args:
+            audio: Input audio array
+            start_sample: Start of deletion range
+            end_sample: End of deletion range
+            sample_rate: Audio sample rate in Hz
+
+        Returns:
+            New audio array with the range deleted and cross-faded
+        """
+        if start_sample >= end_sample:
+            return audio.copy()
+
+        if start_sample < 0:
+            start_sample = 0
+        if end_sample > len(audio):
+            end_sample = len(audio)
+
+        # Calculate fade samples
+        selection_samples = end_sample - start_sample
+        fade_samples = AudioEditor._calculate_fade_samples(
+            sample_rate, selection_samples
+        )
+
+        # Get the parts before and after the deletion
+        before = audio[:start_sample]
+        after = audio[end_sample:]
+
+        if (
+            fade_samples > 0
+            and len(before) >= fade_samples
+            and len(after) >= fade_samples
+        ):
+            # Apply cross-fade between the end of 'before' and start of 'after'
+            before_fade = before[-fade_samples:]
+            after_fade = after[:fade_samples]
+
+            crossfaded = AudioEditor._equal_power_crossfade(
+                before_fade, after_fade, fade_samples
+            )
+
+            # Construct result: before (minus fade region) + crossfade + after (minus fade region)
+            result = np.concatenate(
+                [before[:-fade_samples], crossfaded, after[fade_samples:]]
+            )
+        else:
+            # No cross-fade possible, just concatenate
+            result = np.concatenate([before, after])
+
+        return result
+
+    @staticmethod
+    def insert_at_position(
+        original: np.ndarray,
+        insert: np.ndarray,
+        position: int,
+        sample_rate: int,
+    ) -> np.ndarray:
+        """Insert audio at a position with cross-fade.
+
+        Args:
+            original: Original audio array
+            insert: Audio to insert
+            position: Sample position to insert at
+            sample_rate: Audio sample rate in Hz
+
+        Returns:
+            New audio array with the inserted content cross-faded
+        """
+        if len(insert) == 0:
+            return original.copy()
+
+        if position < 0:
+            position = 0
+        if position > len(original):
+            position = len(original)
+
+        # Calculate fade samples based on insert length
+        fade_samples = AudioEditor._calculate_fade_samples(sample_rate, len(insert))
+
+        before = original[:position]
+        after = original[position:]
+
+        if fade_samples > 0:
+            # Cross-fade at insertion point
+            result_parts = []
+
+            # Before section
+            if len(before) >= fade_samples:
+                # Fade out the end of 'before' and fade in start of 'insert'
+                before_fade = before[-fade_samples:]
+                insert_start_fade = (
+                    insert[:fade_samples] if len(insert) >= fade_samples else insert
+                )
+
+                if len(insert_start_fade) == fade_samples:
+                    crossfaded_start = AudioEditor._equal_power_crossfade(
+                        before_fade, insert_start_fade, fade_samples
+                    )
+                    result_parts.append(before[:-fade_samples])
+                    result_parts.append(crossfaded_start)
+                else:
+                    result_parts.append(before)
+            else:
+                result_parts.append(before)
+
+            # Middle section of insert (if any)
+            if len(insert) > 2 * fade_samples:
+                result_parts.append(insert[fade_samples:-fade_samples])
+            elif len(insert) > fade_samples:
+                result_parts.append(insert[fade_samples:])
+
+            # After section
+            if len(after) >= fade_samples and len(insert) >= fade_samples:
+                # Fade out end of 'insert' and fade in start of 'after'
+                insert_end_fade = insert[-fade_samples:]
+                after_fade = after[:fade_samples]
+
+                crossfaded_end = AudioEditor._equal_power_crossfade(
+                    insert_end_fade, after_fade, fade_samples
+                )
+                result_parts.append(crossfaded_end)
+                result_parts.append(after[fade_samples:])
+            else:
+                result_parts.append(after)
+
+            result = np.concatenate([p for p in result_parts if len(p) > 0])
+        else:
+            # No cross-fade, simple concatenation
+            result = np.concatenate([before, insert, after])
+
+        return result
+
+    @staticmethod
+    def replace_range(
+        original: np.ndarray,
+        replacement: np.ndarray,
+        start_sample: int,
+        end_sample: int,
+        sample_rate: int,
+    ) -> np.ndarray:
+        """Replace a range of audio with new content and cross-fade.
+
+        Args:
+            original: Original audio array
+            replacement: Audio to replace the range with
+            start_sample: Start of range to replace
+            end_sample: End of range to replace
+            sample_rate: Audio sample rate in Hz
+
+        Returns:
+            New audio array with the range replaced and cross-faded
+        """
+        if start_sample >= end_sample:
+            return original.copy()
+
+        if start_sample < 0:
+            start_sample = 0
+        if end_sample > len(original):
+            end_sample = len(original)
+
+        # Calculate fade samples
+        selection_samples = end_sample - start_sample
+        fade_samples = AudioEditor._calculate_fade_samples(
+            sample_rate, min(selection_samples, len(replacement))
+        )
+
+        before = original[:start_sample]
+        after = original[end_sample:]
+
+        if fade_samples > 0:
+            result_parts = []
+
+            # Cross-fade at start of replacement
+            if len(before) >= fade_samples and len(replacement) >= fade_samples:
+                before_fade = before[-fade_samples:]
+                replacement_start = replacement[:fade_samples]
+
+                crossfaded_start = AudioEditor._equal_power_crossfade(
+                    before_fade, replacement_start, fade_samples
+                )
+                result_parts.append(before[:-fade_samples])
+                result_parts.append(crossfaded_start)
+            else:
+                result_parts.append(before)
+
+            # Middle of replacement
+            if len(replacement) > 2 * fade_samples:
+                result_parts.append(replacement[fade_samples:-fade_samples])
+            elif len(replacement) > fade_samples:
+                result_parts.append(replacement[fade_samples:])
+
+            # Cross-fade at end of replacement
+            if len(after) >= fade_samples and len(replacement) >= fade_samples:
+                replacement_end = replacement[-fade_samples:]
+                after_start = after[:fade_samples]
+
+                crossfaded_end = AudioEditor._equal_power_crossfade(
+                    replacement_end, after_start, fade_samples
+                )
+                result_parts.append(crossfaded_end)
+                result_parts.append(after[fade_samples:])
+            else:
+                result_parts.append(after)
+
+            result = np.concatenate([p for p in result_parts if len(p) > 0])
+        else:
+            # No cross-fade, simple replacement
+            result = np.concatenate([before, replacement, after])
+
+        return result
+
+    @staticmethod
+    def _equal_power_crossfade(
+        audio_a: np.ndarray, audio_b: np.ndarray, fade_samples: int
+    ) -> np.ndarray:
+        """Apply equal-power cross-fade between two audio segments.
+
+        Equal-power cross-fade maintains constant perceived loudness
+        during the transition by using sine/cosine curves for gain.
+
+        Args:
+            audio_a: First audio segment (fade out)
+            audio_b: Second audio segment (fade in)
+            fade_samples: Number of samples for the fade
+
+        Returns:
+            Cross-faded audio segment of length fade_samples
+        """
+        if fade_samples <= 0:
+            return audio_b[:0] if len(audio_b) > 0 else np.array([])
+
+        # Ensure we have enough samples
+        actual_samples = min(fade_samples, len(audio_a), len(audio_b))
+        if actual_samples <= 0:
+            return np.array([])
+
+        # Equal power cross-fade using sine/cosine curves
+        t = np.linspace(0, np.pi / 2, actual_samples)
+        gain_a = np.cos(t)  # Fade out
+        gain_b = np.sin(t)  # Fade in
+
+        result = audio_a[:actual_samples] * gain_a + audio_b[:actual_samples] * gain_b
+
+        return result
+
+    @staticmethod
+    def _calculate_fade_samples(sample_rate: int, selection_samples: int) -> int:
+        """Calculate the number of samples for cross-fade.
+
+        The fade length is adaptive: it uses the configured cross-fade duration
+        but is capped at half the selection length to ensure smooth transitions
+        for short selections.
+
+        Args:
+            sample_rate: Audio sample rate in Hz
+            selection_samples: Number of samples in the selection
+
+        Returns:
+            Number of samples to use for cross-fade
+        """
+        # Calculate fade samples from configured duration
+        fade_from_config = int(AudioConstants.CROSSFADE_MS * sample_rate / 1000)
+
+        # Cap at half the selection length
+        max_fade = selection_samples // 2
+
+        return min(fade_from_config, max_fade)