Rewrite enums to use libvlc-sys symbols

2-bindgen
T. Okubo 2019-11-23 20:14:44 +09:00
parent 28fafc02f5
commit c52205075c
2 changed files with 160 additions and 148 deletions

View File

@ -154,7 +154,7 @@ unsafe extern "C" fn logging_cb(
vsnprintf(buf.as_mut_ptr(), BUF_SIZE, fmt, args);
f(::std::mem::transmute(level), Log{ptr: ctx}, from_cstr_ref(buf.as_ptr()).unwrap());
f((level as u32).into(), Log{ptr: ctx}, from_cstr_ref(buf.as_ptr()).unwrap());
}
/// List of module description.
@ -349,7 +349,7 @@ unsafe extern "C" fn event_manager_callback(pe: *const sys::libvlc_event_t, data
// Convert c-style libvlc_event_t to Event
fn conv_event(pe: *const sys::libvlc_event_t) -> Event {
let event_type: EventType = unsafe{ ::std::mem::transmute((*pe)._type) };
let event_type: EventType = (unsafe{ (*pe)._type } as u32).into();
match event_type {
EventType::MediaMetaChanged => {

View File

@ -2,158 +2,170 @@
// This file is part of vlc-rs.
// Licensed under the MIT license, see the LICENSE file.
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum LogLevel {
Debug = 0,
Notice = 2,
Warning = 3,
Error = 4,
use libvlc_sys as sys;
macro_rules! define_enum {
($enum_name:ident, $original_type:ident; $($value:ident = $c_value:ident,)*) => {
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
#[repr(C)]
pub enum $enum_name {
$(
$value = sys::$c_value as isize,
)*
}
impl From<sys::$original_type> for $enum_name {
fn from(a: sys::$original_type) -> Self {
match a {
$(
sys::$c_value => Self::$value,
)*
_ => unreachable!(),
}
}
}
}
}
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum Meta {
Title,
Artist,
Genre,
Copyright,
Album,
TrackNumber,
Description,
Rating,
Date,
Setting,
URL,
Language,
NowPlaying,
Publisher,
EncodedBy,
ArtworkURL,
TrackID,
TrackTotal,
Director,
Season,
Episode,
ShowName,
Actors
}
define_enum!(
LogLevel, libvlc_log_level;
Debug = libvlc_log_level_LIBVLC_DEBUG,
Dotice = libvlc_log_level_LIBVLC_NOTICE,
Warning = libvlc_log_level_LIBVLC_WARNING,
Error = libvlc_log_level_LIBVLC_ERROR,
);
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum State {
NothingSpecial = 0,
Opening,
Buffering,
Playing,
Paused,
Stopped,
Ended,
Error
}
define_enum!(
Meta, libvlc_meta_t;
Title = libvlc_meta_t_libvlc_meta_Title,
Artist = libvlc_meta_t_libvlc_meta_Artist,
Genre = libvlc_meta_t_libvlc_meta_Genre,
Copyright = libvlc_meta_t_libvlc_meta_Copyright,
Album = libvlc_meta_t_libvlc_meta_Album,
TrackNumber = libvlc_meta_t_libvlc_meta_TrackNumber,
Description = libvlc_meta_t_libvlc_meta_Description,
Rating = libvlc_meta_t_libvlc_meta_Rating,
Date = libvlc_meta_t_libvlc_meta_Date,
Setting = libvlc_meta_t_libvlc_meta_Setting,
URL = libvlc_meta_t_libvlc_meta_URL,
Language = libvlc_meta_t_libvlc_meta_Language,
NowPlaying = libvlc_meta_t_libvlc_meta_NowPlaying,
Publisher = libvlc_meta_t_libvlc_meta_Publisher,
EncodedBy = libvlc_meta_t_libvlc_meta_EncodedBy,
ArtworkURL = libvlc_meta_t_libvlc_meta_ArtworkURL,
TrackID = libvlc_meta_t_libvlc_meta_TrackID,
TrackTotal = libvlc_meta_t_libvlc_meta_TrackTotal,
Director = libvlc_meta_t_libvlc_meta_Director,
Season = libvlc_meta_t_libvlc_meta_Season,
Episode = libvlc_meta_t_libvlc_meta_Episode,
ShowName = libvlc_meta_t_libvlc_meta_ShowName,
Actors = libvlc_meta_t_libvlc_meta_Actors,
);
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum TrackType {
Unknown = -1,
Audio = 0,
Video = 1,
Text = 2
}
define_enum!(
State, libvlc_state_t;
NothingSpecial = libvlc_state_t_libvlc_NothingSpecial,
Opening = libvlc_state_t_libvlc_Opening,
Buffering = libvlc_state_t_libvlc_Buffering,
Playing = libvlc_state_t_libvlc_Playing,
Paused = libvlc_state_t_libvlc_Paused,
Stopped = libvlc_state_t_libvlc_Stopped,
Ended = libvlc_state_t_libvlc_Ended,
Error = libvlc_state_t_libvlc_Error,
);
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum Position {
Disable = -1,
Center,
Left,
Right,
Top,
TopLeft,
TopRight,
Bottom,
BottomLeft,
BottomRight,
}
define_enum!(
TrackType, libvlc_track_type_t;
Unknown = libvlc_track_type_t_libvlc_track_unknown,
Audio = libvlc_track_type_t_libvlc_track_audio,
Video = libvlc_track_type_t_libvlc_track_video,
Text = libvlc_track_type_t_libvlc_track_text,
);
#[repr(C)]
#[derive(Clone, Copy, Debug)]
pub enum VideoAdjustOption {
Enable = 0,
Contrast,
Brightness,
Hue,
Saturation,
Gamma
}
define_enum!(
Position, libvlc_position_t;
Disable = libvlc_position_t_libvlc_position_disable,
Center = libvlc_position_t_libvlc_position_center,
Left = libvlc_position_t_libvlc_position_left,
Right = libvlc_position_t_libvlc_position_right,
Top = libvlc_position_t_libvlc_position_top,
TopLeft = libvlc_position_t_libvlc_position_top_left,
TopRight = libvlc_position_t_libvlc_position_top_right,
Bottom = libvlc_position_t_libvlc_position_bottom,
BottomLeft = libvlc_position_t_libvlc_position_bottom_left,
BottomRight = libvlc_position_t_libvlc_position_bottom_right,
);
// #[repr(C)]
// #[derive(Clone, Copy, PartialEq, Eq, Debug)]
// pub enum ParseFlag {
// ParseLocal,
// ParseNetwork,
// FetchLocal,
// FetchNetwork,
// }
define_enum!(
VideoAdjustOption, libvlc_video_adjust_option_t;
Enable = libvlc_video_adjust_option_t_libvlc_adjust_Enable,
Contrast = libvlc_video_adjust_option_t_libvlc_adjust_Contrast,
Brightness = libvlc_video_adjust_option_t_libvlc_adjust_Brightness,
Hue = libvlc_video_adjust_option_t_libvlc_adjust_Hue,
Saturation = libvlc_video_adjust_option_t_libvlc_adjust_Saturation,
Gamma = libvlc_video_adjust_option_t_libvlc_adjust_Gamma,
);
#[repr(C)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
pub enum EventType {
MediaMetaChanged = 0,
MediaSubItemAdded,
MediaDurationChanged,
MediaParsedChanged,
MediaFreed,
MediaStateChanged,
MediaSubItemTreeAdded,
define_enum!(
ParseFlag, libvlc_media_parse_flag_t;
DoInteract = libvlc_media_parse_flag_t_libvlc_media_do_interact,
FetchLocal = libvlc_media_parse_flag_t_libvlc_media_fetch_local,
FetchNetwork = libvlc_media_parse_flag_t_libvlc_media_fetch_network,
ParseLocal = libvlc_media_parse_flag_t_libvlc_media_parse_local,
ParseNetwork = libvlc_media_parse_flag_t_libvlc_media_parse_network,
);
MediaPlayerMediaChanged = 0x100,
MediaPlayerNothingSpecial,
MediaPlayerOpening,
MediaPlayerBuffering,
MediaPlayerPlaying,
MediaPlayerPaused,
MediaPlayerStopped,
MediaPlayerForward,
MediaPlayerBackward,
MediaPlayerEndReached,
MediaPlayerEncounteredError,
MediaPlayerTimeChanged,
MediaPlayerPositionChanged,
MediaPlayerSeekableChanged,
MediaPlayerPausableChanged,
MediaPlayerTitleChanged,
MediaPlayerSnapshotTaken,
MediaPlayerLengthChanged,
MediaPlayerVout,
MediaPlayerScrambledChanged,
MediaListItemAdded = 0x200,
MediaListWillAddItem,
MediaListItemDeleted,
MediaListWillDeleteItem,
MediaListViewItemAdded = 0x300,
MediaListViewWillAddItem,
MediaListViewItemDeleted,
MediaListViewWillDeleteItem,
MediaListPlayerPlayed = 0x400,
MediaListPlayerNextItemSet,
MediaListPlayerStopped,
MediaDiscovererStarted = 0x500,
MediaDiscovererEnded,
VlmMediaAdded = 0x600,
VlmMediaRemoved,
VlmMediaChanged,
VlmMediaInstanceStarted,
VlmMediaInstanceStopped,
VlmMediaInstanceStatusInit,
VlmMediaInstanceStatusOpening,
VlmMediaInstanceStatusPlaying,
VlmMediaInstanceStatusPause,
VlmMediaInstanceStatusEnd,
VlmMediaInstanceStatusError
}
define_enum!(
EventType, libvlc_event_e;
MediaMetaChanged = libvlc_event_e_libvlc_MediaMetaChanged,
MediaSubItemAdded = libvlc_event_e_libvlc_MediaSubItemAdded,
MediaDurationChanged = libvlc_event_e_libvlc_MediaDurationChanged,
MediaParsedChanged = libvlc_event_e_libvlc_MediaParsedChanged,
MediaFreed = libvlc_event_e_libvlc_MediaFreed,
MediaStateChanged = libvlc_event_e_libvlc_MediaStateChanged,
MediaSubItemTreeAdded = libvlc_event_e_libvlc_MediaSubItemTreeAdded,
MediaPlayerMediaChanged = libvlc_event_e_libvlc_MediaPlayerMediaChanged,
MediaPlayerNothingSpecial = libvlc_event_e_libvlc_MediaPlayerNothingSpecial,
MediaPlayerOpening = libvlc_event_e_libvlc_MediaPlayerOpening,
MediaPlayerBuffering = libvlc_event_e_libvlc_MediaPlayerBuffering,
MediaPlayerPlaying = libvlc_event_e_libvlc_MediaPlayerPlaying,
MediaPlayerPaused = libvlc_event_e_libvlc_MediaPlayerPaused,
MediaPlayerStopped = libvlc_event_e_libvlc_MediaPlayerStopped,
MediaPlayerForward = libvlc_event_e_libvlc_MediaPlayerForward,
MediaPlayerBackward = libvlc_event_e_libvlc_MediaPlayerBackward,
MediaPlayerEndReached = libvlc_event_e_libvlc_MediaPlayerEndReached,
MediaPlayerEncounteredError = libvlc_event_e_libvlc_MediaPlayerEncounteredError,
MediaPlayerTimeChanged = libvlc_event_e_libvlc_MediaPlayerTimeChanged,
MediaPlayerPositionChanged = libvlc_event_e_libvlc_MediaPlayerPositionChanged,
MediaPlayerSeekableChanged = libvlc_event_e_libvlc_MediaPlayerSeekableChanged,
MediaPlayerPausableChanged = libvlc_event_e_libvlc_MediaPlayerPausableChanged,
MediaPlayerTitleChanged = libvlc_event_e_libvlc_MediaPlayerTitleChanged,
MediaPlayerSnapshotTaken = libvlc_event_e_libvlc_MediaPlayerSnapshotTaken,
MediaPlayerLengthChanged = libvlc_event_e_libvlc_MediaPlayerLengthChanged,
MediaPlayerVout = libvlc_event_e_libvlc_MediaPlayerVout,
MediaPlayerScrambledChanged = libvlc_event_e_libvlc_MediaPlayerScrambledChanged,
MediaListItemAdded = libvlc_event_e_libvlc_MediaListItemAdded,
MediaListWillAddItem = libvlc_event_e_libvlc_MediaListWillAddItem,
MediaListItemDeleted = libvlc_event_e_libvlc_MediaListItemDeleted,
MediaListWillDeleteItem = libvlc_event_e_libvlc_MediaListWillDeleteItem,
MediaListViewItemAdded = libvlc_event_e_libvlc_MediaListViewItemAdded,
MediaListViewWillAddItem = libvlc_event_e_libvlc_MediaListViewWillAddItem,
MediaListViewItemDeleted = libvlc_event_e_libvlc_MediaListViewItemDeleted,
MediaListViewWillDeleteItem = libvlc_event_e_libvlc_MediaListViewWillDeleteItem,
MediaListPlayerPlayed = libvlc_event_e_libvlc_MediaListPlayerPlayed,
MediaListPlayerNextItemSet = libvlc_event_e_libvlc_MediaListPlayerNextItemSet,
MediaListPlayerStopped = libvlc_event_e_libvlc_MediaListPlayerStopped,
MediaDiscovererStarted = libvlc_event_e_libvlc_MediaDiscovererStarted,
MediaDiscovererEnded = libvlc_event_e_libvlc_MediaDiscovererEnded,
VlmMediaAdded = libvlc_event_e_libvlc_VlmMediaAdded,
VlmMediaRemoved = libvlc_event_e_libvlc_VlmMediaRemoved,
VlmMediaChanged = libvlc_event_e_libvlc_VlmMediaChanged,
VlmMediaInstanceStarted = libvlc_event_e_libvlc_VlmMediaInstanceStarted,
VlmMediaInstanceStopped = libvlc_event_e_libvlc_VlmMediaInstanceStopped,
VlmMediaInstanceStatusInit = libvlc_event_e_libvlc_VlmMediaInstanceStatusInit,
VlmMediaInstanceStatusOpening = libvlc_event_e_libvlc_VlmMediaInstanceStatusOpening,
VlmMediaInstanceStatusPlaying = libvlc_event_e_libvlc_VlmMediaInstanceStatusPlaying,
VlmMediaInstanceStatusPause = libvlc_event_e_libvlc_VlmMediaInstanceStatusPause,
VlmMediaInstanceStatusEnd = libvlc_event_e_libvlc_VlmMediaInstanceStatusEnd,
VlmMediaInstanceStatusError = libvlc_event_e_libvlc_VlmMediaInstanceStatusError,
);