[client] spice: update submodule and update to use new PSConfig members

This commit is contained in:
Geoffrey McRae 2021-12-29 20:22:07 +11:00
parent 7c8f42855d
commit c74d48691f
2 changed files with 24 additions and 20 deletions

View File

@ -1003,30 +1003,34 @@ static int lg_run(void)
g_params.useSpiceClipboard || g_params.useSpiceClipboard ||
g_params.useSpiceAudio) g_params.useSpiceAudio)
{ {
if (g_params.useSpiceClipboard)
purespice_setClipboardCb(
cb_spiceNotice,
cb_spiceData,
cb_spiceRelease,
cb_spiceRequest);
if (g_params.useSpiceAudio)
purespice_setAudioCb(
audioStart,
audioVolume,
audioMute,
audioStop,
audioData);
const struct PSConfig config = const struct PSConfig config =
{ {
.host = g_params.spiceHost, .host = g_params.spiceHost,
.port = g_params.spicePort, .port = g_params.spicePort,
.password = "", .password = "",
.playback = g_params.useSpiceAudio, .log =
.log.info = debug_info, {
.log.warn = debug_warn, .info = debug_info,
.log.error = debug_error .warn = debug_warn,
.error = debug_error,
},
.clipboard =
{
.enable = g_params.useSpiceClipboard,
.notice = cb_spiceNotice,
.data = cb_spiceData,
.release = cb_spiceRelease,
.request = cb_spiceRequest
},
.playback =
{
.enable = g_params.useSpiceAudio,
.start = audioStart,
.volume = audioVolume,
.mute = audioMute,
.stop = audioStop,
.data = audioData
}
}; };
if (!purespice_connect(&config)) if (!purespice_connect(&config))

@ -1 +1 @@
Subproject commit e8282fac566ce02775926f42f3a977e840664f4f Subproject commit a9664f731ab720ff890c35225f271048addfd54d