Skip to content

Commit 0d943d5

Browse files
committed
Update CI
1 parent 9f38860 commit 0d943d5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defaults:
2828
run:
2929
shell: bash
3030
env:
31-
VCPKG_COMMITTISH: 10b7a178346f3f0abef60cecd5130e295afd8da4
31+
VCPKG_COMMITTISH: 6f29f12e82a8293156836ad81cc9bf5af41fe836
3232

3333
jobs:
3434
build_windows:
@@ -78,7 +78,7 @@ jobs:
7878
build/${{env.CMAKE_BUILD_TYPE}}/rsgain.exe -v
7979
8080
- name: Upload Package
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: Windows build
8484
path: build/*.zip
@@ -166,7 +166,7 @@ jobs:
166166
build/rsgain -v
167167
168168
- name: Upload Package
169-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
170170
with:
171171
name: ${{matrix.config.name}} build
172172
path: build/*${{matrix.config.package_ext}}
@@ -244,7 +244,7 @@ jobs:
244244
run: build/rsgain -v
245245

246246
- name: Upload Package
247-
uses: actions/upload-artifact@v3
247+
uses: actions/upload-artifact@v4
248248
with:
249249
name: macOS ${{matrix.config.name}} build
250250
path: build/*.zip

src/scan.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ bool ScanJob::scan(std::mutex *ffmpeg_mutex)
181181
std::vector<size_t> remove;
182182
for (Track &track : tracks) {
183183
ret = track.scan(config, ffmpeg_mutex);
184-
if (ret == ScanReturn::ERROR) {
184+
if (ret == ScanReturn::ERR) {
185185
error = true;
186186
return false;
187187
}
@@ -204,7 +204,7 @@ ScanReturn ScanJob::Track::scan(const Config &config, std::mutex *m)
204204
ProgressBar progress_bar;
205205
int rc, stream_id = -1;
206206
uint8_t *swr_out_data[1];
207-
ScanReturn ret = ScanReturn::ERROR;
207+
ScanReturn ret = ScanReturn::ERR;
208208
bool repeat = false;
209209
int peak_mode;
210210
double time_base;

src/scan.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct ScanResult {
3636
};
3737

3838
enum class ScanReturn {
39-
ERROR,
39+
ERR,
4040
NO_STREAM,
4141
SUCCESS
4242
};

0 commit comments

Comments
 (0)