Merge branch 'main' into effects

.github/workflows/build.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.71.0
+          toolchain: 1.74.0
       - name: cargo build
         run: cargo build --release --features ${{ matrix.feature }}
       - name: Create release directory
@@ -66,7 +66,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.71.0
+          toolchain: 1.74.0
       - name: Install cargo bundle
         run: cargo install cargo-bundle
       - name: cargo build
@@ -92,7 +92,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.71.0
+          toolchain: 1.74.0
       - name: cargo build
         run: cargo build --release
       - name: Download butler

.github/workflows/test.yaml

@@ -64,11 +64,6 @@ jobs:
         with:
           toolchain: stable
 
-      # Cache the built dependencies
-      - uses: Swatinem/[email protected]
-        with:
-          save-if: ${{ github.event_name == 'push' }}
-
       # Install the required dependencies on Ubuntu
       - name: Install test dependencies
         run: sudo apt-get install clang cmake speech-dispatcher libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev

README.md

@@ -12,7 +12,7 @@
 
 ## How to compile
 
-I compile Cacophony with Rust 1.71.0 for Linux, MacOS, or Windows. Below is a list of operating systems I've tested:
+I compile Cacophony with Rust 1.74.0 for Linux, MacOS, or Windows. Below is a list of operating systems I've tested:
 
 Linux:
 
@@ -35,13 +35,6 @@ Windows:
 1. Install Rust (stable)
 2. Clone this repo
 
-The instructions below will *compile* the code. To *run* it, do one of the following:
-
-1. Move `data/` to the output directory (`target/release/`)
-2. Replace `cargo build` in the instructions below with `cargo run`
-
-If you want debug messages, remove `--release` The output will be `target/debug/` instead of `release/`
-
 ### Linux
 
 #### Debian 11
@@ -93,6 +86,31 @@ EnableSoundFontPanel
 SelectFile
 ```
 
+## How to run
+
+You can run Cacophony like any other application or you can use Rust's `cargo run` to compile and execute.
+
+### Linux
+
+There are two ways to run Cacophony:
+
+1. Copy + paste `data/` into the output directory (`target/release/`). Open a terminal in `release/` and run `./Cacophony` .
+2. Instead of `cargo build --release`, run `cargo run --release` Include the `--features` listed above, for example `cargo build --release --features speech_dispatcher_0_11` on Ubuntu 22
+
+### MacOS
+
+There are two ways to run Cacophony:
+
+1. After compiling, double-click `Cacophony.app` (located in `./target/release/`)
+2. `cargo run --release` This will compile and launch the application but it won't create a .app
+
+### Windows
+
+There are two ways to run Cacophony:
+
+1. Copy + paste `data/` into the output directory (`target/release/`) and double-click `Cacophony.exe` (located in `release/`)
+2. Instead of `cargo build --release`, run `cargo run --release`
+
 ## Upload
 
 Assuming that you are Esther Alter and you have the relevant credentials on your computer, you can upload the website and create itch.io builds by doing this:

audio/src/exporter.rs

@@ -364,8 +364,7 @@ impl Exporter {
             right: &buffer[1],
         };
         // Get the output buffer.
-        let mut mp3_out_buffer = Vec::new();
-        mp3_out_buffer.reserve(max_required_buffer_size(buffer[0].len()));
+        let mut mp3_out_buffer = Vec::with_capacity(max_required_buffer_size(buffer[0].len()));
         // Get the size.
         let encoded_size = mp3_encoder
             .encode(input, mp3_out_buffer.spare_capacity_mut())