From a88aca80647efc3ea363703493a8b4f9f573f588 Mon Sep 17 00:00:00 2001 From: Hans Baier Date: Tue, 3 Mar 2009 06:48:07 +0700 Subject: [PATCH] * uint32 -> jack_nframes_t works --- jack.vapi | 73 ++++++++++++++++++++++++++---------------------- jackpanel/Display.vala | 18 ++++++------ jackpanel/Jackpanel.vala | 6 ++-- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/jack.vapi b/jack.vapi index cbfd97d..fbdfcfe 100644 --- a/jack.vapi +++ b/jack.vapi @@ -1,4 +1,9 @@ /* jack.vapi generated by vapigen, do not modify. */ + [SimpleType] + [IntegerType (rank = 7)] + [CCode (cname = "jack_nframes_t", cheader_filename = "jack/jack.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "u")] + public struct jack_nframes_t { + } [Compact] [CCode (cheader_filename = "jack/jack.h")] public class jack_client_t { @@ -20,7 +25,7 @@ public class jack_midi_event_t { public weak jack_midi_data_t buffer; public size_t size; - public weak uint32 time; + public weak jack_nframes_t time; } [Compact] [CCode (cheader_filename = "jack/jack.h")] @@ -36,13 +41,13 @@ public float audio_frames_per_video_frame; public int32 bar; public double bar_start_tick; - public weak uint32 bbt_offset; + public weak jack_nframes_t bbt_offset; public int32 beat; public float beat_type; public float beats_per_bar; public double beats_per_minute; - public weak uint32 frame; - public weak uint32 frame_rate; + public weak jack_nframes_t frame; + public weak jack_nframes_t frame_rate; public double frame_time; public double next_time; [CCode (array_length = false)] @@ -53,7 +58,7 @@ public weak jack_unique_t unique_2; public weak jack_time_t usecs; public jack_position_bits_t valid; - public weak uint32 video_offset; + public weak jack_nframes_t video_offset; } [Compact] [CCode (cheader_filename = "jack/jack.h")] @@ -88,10 +93,10 @@ public float beat_type; public float beats_per_bar; public double beats_per_minute; - public weak uint32 frame; - public weak uint32 frame_rate; - public weak uint32 loop_end; - public weak uint32 loop_start; + public weak jack_nframes_t frame; + public weak jack_nframes_t frame_rate; + public weak jack_nframes_t loop_end; + public weak jack_nframes_t loop_start; public float smpte_frame_rate; public long smpte_offset; public int tick; @@ -152,7 +157,7 @@ JackTransportStarting } [CCode (cheader_filename = "jack/jack.h")] - public static delegate int JackBufferSizeCallback (uint32 nframes, void* arg); + public static delegate int JackBufferSizeCallback (jack_nframes_t nframes, void* arg); [CCode (cheader_filename = "jack/jack.h")] public static delegate void JackClientRegistrationCallback (string name, int p2, void* arg); [CCode (cheader_filename = "jack/jack.h")] @@ -164,9 +169,9 @@ [CCode (cheader_filename = "jack/jack.h")] public static delegate void JackPortRegistrationCallback (jack_port_id_t port, int p2, void* arg); [CCode (cheader_filename = "jack/jack.h")] - public static delegate int JackProcessCallback (uint32 nframes, void* arg); + public static delegate int JackProcessCallback (jack_nframes_t nframes, void* arg); [CCode (cheader_filename = "jack/jack.h")] - public static delegate int JackSampleRateCallback (uint32 nframes, void* arg); + public static delegate int JackSampleRateCallback (jack_nframes_t nframes, void* arg); [CCode (cheader_filename = "jack/jack.h")] public static delegate int JackSyncCallback (jack_transport_state_t state, jack_position_t pos, void* arg); [CCode (cheader_filename = "jack/jack.h")] @@ -174,7 +179,7 @@ [CCode (cheader_filename = "jack/jack.h")] public static delegate void JackThreadInitCallback (void* arg); [CCode (cheader_filename = "jack/jack.h")] - public static delegate void JackTimebaseCallback (jack_transport_state_t state, uint32 nframes, jack_position_t pos, int new_pos, void* arg); + public static delegate void JackTimebaseCallback (jack_transport_state_t state, jack_nframes_t nframes, jack_position_t pos, int new_pos, void* arg); [CCode (cheader_filename = "jack/jack.h")] public static delegate int JackXRunCallback (void* arg); [CCode (cheader_filename = "jack/jack.h")] @@ -220,7 +225,7 @@ [CCode (cname = "jack_cycle_signal", cheader_filename = "jack/jack.h")] public static void jack_cycle_signal (jack_client_t client, int status); [CCode (cname = "jack_cycle_wait", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_cycle_wait (jack_client_t client); + public static unowned jack_nframes_t jack_cycle_wait (jack_client_t client); [CCode (cname = "jack_deactivate", cheader_filename = "jack/jack.h")] public static int jack_deactivate (jack_client_t client); [CCode (cname = "jack_disconnect", cheader_filename = "jack/jack.h")] @@ -232,17 +237,17 @@ [CCode (cname = "jack_engine_takeover_timebase", cheader_filename = "jack/jack.h")] public static int jack_engine_takeover_timebase (jack_client_t p1); [CCode (cname = "jack_frame_time", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_frame_time (jack_client_t p1); + public static unowned jack_nframes_t jack_frame_time (jack_client_t p1); [CCode (cname = "jack_frames_since_cycle_start", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_frames_since_cycle_start (jack_client_t p1); + public static unowned jack_nframes_t jack_frames_since_cycle_start (jack_client_t p1); [CCode (cname = "jack_frames_to_time", cheader_filename = "jack/jack.h")] - public static unowned jack_time_t jack_frames_to_time (jack_client_t client, uint32 p2); + public static unowned jack_time_t jack_frames_to_time (jack_client_t client, jack_nframes_t p2); [CCode (cname = "jack_get_buffer_size", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_get_buffer_size (jack_client_t p1); + public static unowned jack_nframes_t jack_get_buffer_size (jack_client_t p1); [CCode (cname = "jack_get_client_name", cheader_filename = "jack/jack.h")] public static unowned string jack_get_client_name (jack_client_t client); [CCode (cname = "jack_get_current_transport_frame", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_get_current_transport_frame (jack_client_t client); + public static unowned jack_nframes_t jack_get_current_transport_frame (jack_client_t client); [CCode (cname = "jack_get_internal_client_name", cheader_filename = "jack/jack.h")] public static unowned string jack_get_internal_client_name (jack_client_t client, jack_intclient_t intclient); [CCode (cname = "jack_get_max_delayed_usecs", cheader_filename = "jack/jack.h")] @@ -250,7 +255,7 @@ [CCode (cname = "jack_get_ports", cheader_filename = "jack/jack.h")] public static unowned string jack_get_ports (jack_client_t p1, string port_name_pattern, string type_name_pattern, uint flags); [CCode (cname = "jack_get_sample_rate", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_get_sample_rate (jack_client_t p1); + public static unowned jack_nframes_t jack_get_sample_rate (jack_client_t p1); [CCode (cname = "jack_get_time", cheader_filename = "jack/jack.h")] public static unowned jack_time_t jack_get_time (); [CCode (cname = "jack_get_transport_info", cheader_filename = "jack/jack.h")] @@ -272,21 +277,21 @@ [CCode (cname = "jack_is_realtime", cheader_filename = "jack/jack.h")] public static int jack_is_realtime (jack_client_t client); [CCode (cname = "jack_last_frame_time", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_last_frame_time (jack_client_t client); + public static unowned jack_nframes_t jack_last_frame_time (jack_client_t client); [CCode (cname = "jack_midi_buffer_size", cheader_filename = "jack/jack.h")] public static size_t jack_midi_buffer_size (void* port_buffer); [CCode (cname = "jack_midi_clear_buffer", cheader_filename = "jack/jack.h")] public static void jack_midi_clear_buffer (void* port_buffer); [CCode (cname = "jack_midi_event_get", cheader_filename = "jack/jack.h")] - public static int jack_midi_event_get (jack_midi_event_t event, void* port_buffer, uint32 event_index); + public static int jack_midi_event_get (jack_midi_event_t event, void* port_buffer, jack_nframes_t event_index); [CCode (cname = "jack_midi_event_reserve", cheader_filename = "jack/jack.h")] - public static unowned jack_midi_data_t jack_midi_event_reserve (void* port_buffer, uint32 time, size_t data_size); + public static unowned jack_midi_data_t jack_midi_event_reserve (void* port_buffer, jack_nframes_t time, size_t data_size); [CCode (cname = "jack_midi_event_write", cheader_filename = "jack/jack.h")] - public static int jack_midi_event_write (void* port_buffer, uint32 time, jack_midi_data_t data, size_t data_size); + public static int jack_midi_event_write (void* port_buffer, jack_nframes_t time, jack_midi_data_t data, size_t data_size); [CCode (cname = "jack_midi_get_event_count", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_midi_get_event_count (void* port_buffer); + public static unowned jack_nframes_t jack_midi_get_event_count (void* port_buffer); [CCode (cname = "jack_midi_get_lost_event_count", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_midi_get_lost_event_count (void* port_buffer); + public static unowned jack_nframes_t jack_midi_get_lost_event_count (void* port_buffer); [CCode (cname = "jack_midi_max_event_size", cheader_filename = "jack/jack.h")] public static size_t jack_midi_max_event_size (void* port_buffer); [CCode (cname = "jack_on_shutdown", cheader_filename = "jack/jack.h")] @@ -310,13 +315,13 @@ [CCode (cname = "jack_port_get_all_connections", cheader_filename = "jack/jack.h")] public static unowned string jack_port_get_all_connections (jack_client_t client, jack_port_t port); [CCode (cname = "jack_port_get_buffer", cheader_filename = "jack/jack.h")] - public static void* jack_port_get_buffer (jack_port_t p1, uint32 p2); + public static void* jack_port_get_buffer (jack_port_t p1, jack_nframes_t p2); [CCode (cname = "jack_port_get_connections", cheader_filename = "jack/jack.h")] public static unowned string jack_port_get_connections (jack_port_t port); [CCode (cname = "jack_port_get_latency", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_port_get_latency (jack_port_t port); + public static unowned jack_nframes_t jack_port_get_latency (jack_port_t port); [CCode (cname = "jack_port_get_total_latency", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_port_get_total_latency (jack_client_t p1, jack_port_t port); + public static unowned jack_nframes_t jack_port_get_total_latency (jack_client_t p1, jack_port_t port); [CCode (cname = "jack_port_is_mine", cheader_filename = "jack/jack.h")] public static int jack_port_is_mine (jack_client_t p1, jack_port_t port); [CCode (cname = "jack_port_monitoring_input", cheader_filename = "jack/jack.h")] @@ -334,7 +339,7 @@ [CCode (cname = "jack_port_set_alias", cheader_filename = "jack/jack.h")] public static int jack_port_set_alias (jack_port_t port, string alias); [CCode (cname = "jack_port_set_latency", cheader_filename = "jack/jack.h")] - public static void jack_port_set_latency (jack_port_t p1, uint32 p2); + public static void jack_port_set_latency (jack_port_t p1, jack_nframes_t p2); [CCode (cname = "jack_port_set_name", cheader_filename = "jack/jack.h")] public static int jack_port_set_name (jack_port_t port, string port_name); [CCode (cname = "jack_port_short_name", cheader_filename = "jack/jack.h")] @@ -388,7 +393,7 @@ [CCode (cname = "jack_ringbuffer_write_space", cheader_filename = "jack/jack.h")] public static size_t jack_ringbuffer_write_space (jack_ringbuffer_t rb); [CCode (cname = "jack_set_buffer_size", cheader_filename = "jack/jack.h")] - public static int jack_set_buffer_size (jack_client_t client, uint32 nframes); + public static int jack_set_buffer_size (jack_client_t client, jack_nframes_t nframes); [CCode (cname = "jack_set_buffer_size_callback", cheader_filename = "jack/jack.h")] public static int jack_set_buffer_size_callback (jack_client_t client, JackBufferSizeCallback bufsize_callback, void* arg); [CCode (cname = "jack_set_client_registration_callback", cheader_filename = "jack/jack.h")] @@ -426,13 +431,13 @@ [CCode (cname = "jack_set_xrun_callback", cheader_filename = "jack/jack.h")] public static int jack_set_xrun_callback (jack_client_t p1, JackXRunCallback xrun_callback, void* arg); [CCode (cname = "jack_thread_wait", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_thread_wait (jack_client_t p1, int status); + public static unowned jack_nframes_t jack_thread_wait (jack_client_t p1, int status); [CCode (cname = "jack_time_to_frames", cheader_filename = "jack/jack.h")] - public static unowned uint32 jack_time_to_frames (jack_client_t client, jack_time_t p2); + public static unowned jack_nframes_t jack_time_to_frames (jack_client_t client, jack_time_t p2); [CCode (cname = "jack_timestamp", cheader_filename = "jack/jack.h")] public static void jack_timestamp (string what); [CCode (cname = "jack_transport_locate", cheader_filename = "jack/jack.h")] - public static int jack_transport_locate (jack_client_t client, uint32 frame); + public static int jack_transport_locate (jack_client_t client, jack_nframes_t frame); [CCode (cname = "jack_transport_query", cheader_filename = "jack/jack.h")] public static jack_transport_state_t jack_transport_query (jack_client_t client, ref jack_position_t pos); [CCode (cname = "jack_transport_reposition", cheader_filename = "jack/jack.h")] diff --git a/jackpanel/Display.vala b/jackpanel/Display.vala index 480215d..17bac82 100644 --- a/jackpanel/Display.vala +++ b/jackpanel/Display.vala @@ -55,9 +55,9 @@ public class Display : DisplayBase { } } - static uint[] sample_rates = { 22050, 32000, 44100, 48000, 96000, 192000 }; - private uint32 _sample_rate; - public uint32 sample_rate { + static jack_nframes_t[] sample_rates = { 22050, 32000, 44100, 48000, 96000, 192000 }; + private jack_nframes_t _sample_rate; + public jack_nframes_t sample_rate { get { return _sample_rate; } @@ -68,15 +68,15 @@ public class Display : DisplayBase { } } } - public signal void sample_rate_changed (uint32 new_sample_rate); + public signal void sample_rate_changed (jack_nframes_t new_sample_rate); private double sample_rate_x; private double sample_rate_y; private double sample_rate_w; private double sample_rate_h; private Menu sample_rate_menu; - private uint32 _buffer_size; - public uint32 buffer_size { + private jack_nframes_t _buffer_size; + public jack_nframes_t buffer_size { get { return _buffer_size; } @@ -89,7 +89,7 @@ public class Display : DisplayBase { } static uint[] buffer_sizes = { 16, 32, 64, 128, 256, 512, 1024, 2048 }; - public signal void buffer_size_changed (uint32 new_buffer_size); + public signal void buffer_size_changed (jack_nframes_t new_buffer_size); private double buffer_size_x; private double buffer_size_y; private double buffer_size_w; @@ -243,7 +243,7 @@ public class Display : DisplayBase { var item = new MenuItem.with_label ("%u".printf (sample_rates[i])); item.activate += (item) => { string rate_str = ((Gtk.Label)((Gtk.Item)item).get_child ()).get_text(); - var new_rate = (uint32) rate_str.to_ulong (); + var new_rate = (jack_nframes_t) rate_str.to_ulong (); if (new_rate != sample_rate) { sample_rate_changed (new_rate); } @@ -261,7 +261,7 @@ public class Display : DisplayBase { var item = new MenuItem.with_label ("%2.1fms".printf (buffer_sizes[i]*1000.0/(double)sample_rate)); item.user_data = &buffer_sizes[i]; item.activate += (item) => { - buffer_size_changed (*((uint32 *)item.user_data)); + buffer_size_changed (*((jack_nframes_t *)item.user_data)); }; buffer_size_menu.append (item); } diff --git a/jackpanel/Jackpanel.vala b/jackpanel/Jackpanel.vala index 5182ce1..1edd15e 100644 --- a/jackpanel/Jackpanel.vala +++ b/jackpanel/Jackpanel.vala @@ -56,14 +56,14 @@ public class Jackpanel : Alignment { private void show_time () { jack_position_t current = jack_position_t (); jack_transport_state_t transport_state; - uint32 frame_time; + jack_nframes_t frame_time; transport_state = jack_transport_query (client, ref current); frame_time = jack_frame_time (client); var time_seconds = (int)current.frame / (int)current.frame_rate; time_h_min_sec = "%02d:%02d:%02d".printf (time_seconds / 3600, (time_seconds % 3600) / 60, time_seconds % 60); - time_in_frames = "%u".printf ((uint32)current.frame); + time_in_frames = "%u".printf ((jack_nframes_t)current.frame); switch (transport_state) { case jack_transport_state_t.JackTransportStopped: @@ -213,7 +213,7 @@ public class Jackpanel : Alignment { location = 0.0f; } - jack_transport_locate(client, (uint32)location); + jack_transport_locate(client, (jack_nframes_t)location); } private bool accelerate_transport (TransportButton button, float direction) { -- 2.11.4.GIT