github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix static app key with syntex

Browse source
This commit is contained in:
Paul Lietar 2016-04-24 14:47:52 +01:00
parent a36325a46a
commit 8c0a37357d
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lib.rs
View file

@ -49,7 +49,7 @@ extern crate libpulse_sys;
extern crate librespot_protocol as protocol; extern crate librespot_protocol as protocol;
// This doesn't play nice with syntex, so place it here // include!/include_bytes! don't play nice with syntex, so place these here
pub mod version { pub mod version {
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
@ -58,6 +58,11 @@ pub mod version {
} }
} }
#[cfg(feature = "static-appkey")]
static APPKEY: Option<&'static [u8]> = Some(include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/spotify_appkey.key")));
#[cfg(not(feature = "static-appkey"))]
static APPKEY: Option<&'static [u8]> = None;
#[cfg(feature = "with-syntex")] #[cfg(feature = "with-syntex")]
include!(concat!(env!("OUT_DIR"), "/lib.rs")); include!(concat!(env!("OUT_DIR"), "/lib.rs"));

6
src/main_helper.rs
View file

@ -12,11 +12,7 @@ use cache::{Cache, DefaultCache, NoCache};
use player::Player; use player::Player;
use session::{Bitrate, Config, Session}; use session::{Bitrate, Config, Session};
use version; use version;
use APPKEY;
#[cfg(feature = "static-appkey")]
static APPKEY: Option<&'static [u8]> = Some(include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/spotify_appkey.key")));
#[cfg(not(feature = "static-appkey"))]
static APPKEY: Option<&'static [u8]> = None;
pub fn find_backend(name: Option<&str>) -> &'static (Fn() -> Box<Sink> + Send + Sync) { pub fn find_backend(name: Option<&str>) -> &'static (Fn() -> Box<Sink> + Send + Sync) {
match name { match name {