GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-13 22:13:58 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Windows compilation fixes

Browse source
This commit is contained in:
Damien Elmes 2025-06-18 11:20:03 +07:00
parent db83c27030
commit df347de7e5
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -139,7 +139,7 @@ unicode-normalization = "0.1.24"
walkdir = "2.5.0" walkdir = "2.5.0"
which = "8.0.0" which = "8.0.0"
winapi = { version = "0.3", features = ["wincon"] } winapi = { version = "0.3", features = ["wincon"] }
windows = { version = "0.61.3", features = ["Media_SpeechSynthesis", "Foundation_Collections", "Storage_Streams"] } windows = { version = "0.61.3", features = ["Media_SpeechSynthesis", "Media_Core", "Foundation_Collections", "Storage_Streams"] }
wiremock = "0.6.3" wiremock = "0.6.3"
xz2 = "0.1.7" xz2 = "0.1.7"
zip = { version = "4.1.0", default-features = false, features = ["deflate", "time"] } zip = { version = "4.1.0", default-features = false, features = ["deflate", "time"] }

4
qt/launcher/build.rs
View file

@ -3,6 +3,8 @@
fn main() { fn main() {
#[cfg(windows)] #[cfg(windows)]
{ {
embed_resource::compile("win/anki-manifest.rc", embed_resource::NONE); embed_resource::compile("win/anki-manifest.rc", embed_resource::NONE)
.manifest_required()
.unwrap();
} }
} }

15
rslib/src/card_rendering/tts/windows.rs
View file

@ -5,12 +5,13 @@ use std::fs::File;
use std::io::Write; use std::io::Write;
use anki_proto::card_rendering::all_tts_voices_response::TtsVoice; use anki_proto::card_rendering::all_tts_voices_response::TtsVoice;
use futures::executor::block_on; use windows::core::Interface;
use windows::core::HSTRING; use windows::core::HSTRING;
use windows::Media::SpeechSynthesis::SpeechSynthesisStream; use windows::Media::SpeechSynthesis::SpeechSynthesisStream;
use windows::Media::SpeechSynthesis::SpeechSynthesizer; use windows::Media::SpeechSynthesis::SpeechSynthesizer;
use windows::Media::SpeechSynthesis::VoiceInformation; use windows::Media::SpeechSynthesis::VoiceInformation;
use windows::Storage::Streams::DataReader; use windows::Storage::Streams::DataReader;
use windows::Storage::Streams::IRandomAccessStream;
use crate::error::windows::WindowsErrorDetails; use crate::error::windows::WindowsErrorDetails;
use crate::error::windows::WindowsSnafu; use crate::error::windows::WindowsSnafu;
@ -45,7 +46,7 @@ fn find_voice(voice_id: &str) -> Result<VoiceInformation> {
fn to_hstring(text: &str) -> HSTRING { fn to_hstring(text: &str) -> HSTRING {
let utf16: Vec<u16> = text.encode_utf16().collect(); let utf16: Vec<u16> = text.encode_utf16().collect();
HSTRING::from_wide(&utf16).expect("Strings are valid Unicode") HSTRING::from_wide(&utf16)
} }
fn synthesize_stream( fn synthesize_stream(
@ -64,16 +65,20 @@ fn synthesize_stream(
details: WindowsErrorDetails::SettingRate(speed), details: WindowsErrorDetails::SettingRate(speed),
})?; })?;
let async_op = synthesizer.SynthesizeTextToStreamAsync(&to_hstring(text))?; let async_op = synthesizer.SynthesizeTextToStreamAsync(&to_hstring(text))?;
let stream = block_on(async_op).context(WindowsSnafu { let stream = async_op.get().context(WindowsSnafu {
details: WindowsErrorDetails::Synthesizing, details: WindowsErrorDetails::Synthesizing,
})?; })?;
Ok(stream) Ok(stream)
} }
fn write_stream_to_path(stream: SpeechSynthesisStream, path: &str) -> Result<()> { fn write_stream_to_path(stream: SpeechSynthesisStream, path: &str) -> Result<()> {
let input_stream = stream.GetInputStreamAt(0)?; let random_access_stream: IRandomAccessStream = stream.cast()?;
let input_stream = random_access_stream.GetInputStreamAt(0)?;
let date_reader = DataReader::CreateDataReader(&input_stream)?; let date_reader = DataReader::CreateDataReader(&input_stream)?;
let stream_size = stream.Size()?.try_into().or_invalid("stream too large")?; let stream_size = random_access_stream
.Size()?
.try_into()
.or_invalid("stream too large")?;
date_reader.LoadAsync(stream_size)?; date_reader.LoadAsync(stream_size)?;
let mut file = File::create(path)?; let mut file = File::create(path)?;
write_reader_to_file(date_reader, &mut file, stream_size as usize) write_reader_to_file(date_reader, &mut file, stream_size as usize)