diff -urd kaffe-1.1.8.orig/libraries/clib/sound/alsa/constants_check.h kaffe-1.1.8/libraries/clib/sound/alsa/constants_check.h --- kaffe-1.1.8.orig/libraries/clib/sound/alsa/constants_check.h 2006-01-18 08:37:43.000000000 +0100 +++ kaffe-1.1.8/libraries/clib/sound/alsa/constants_check.h 2008-04-05 19:22:27.000000000 +0200 @@ -70,15 +70,6 @@ assert(SND_SEQ_EVENT_PORT_CHANGE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_CHANGE); assert(SND_SEQ_EVENT_PORT_SUBSCRIBED == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_SUBSCRIBED); assert(SND_SEQ_EVENT_PORT_UNSUBSCRIBED == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_UNSUBSCRIBED); - assert(SND_SEQ_EVENT_SAMPLE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE); - assert(SND_SEQ_EVENT_SAMPLE_CLUSTER == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_CLUSTER); - assert(SND_SEQ_EVENT_SAMPLE_START == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_START); - assert(SND_SEQ_EVENT_SAMPLE_STOP == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_STOP); - assert(SND_SEQ_EVENT_SAMPLE_FREQ == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_FREQ); - assert(SND_SEQ_EVENT_SAMPLE_VOLUME == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_VOLUME); - assert(SND_SEQ_EVENT_SAMPLE_LOOP == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_LOOP); - assert(SND_SEQ_EVENT_SAMPLE_POSITION == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_POSITION); - assert(SND_SEQ_EVENT_SAMPLE_PRIVATE1 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_PRIVATE1); assert(SND_SEQ_EVENT_USR0 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR0); assert(SND_SEQ_EVENT_USR1 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR1); assert(SND_SEQ_EVENT_USR2 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR2); @@ -89,25 +80,6 @@ assert(SND_SEQ_EVENT_USR7 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR7); assert(SND_SEQ_EVENT_USR8 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR8); assert(SND_SEQ_EVENT_USR9 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR9); - assert(SND_SEQ_EVENT_INSTR_BEGIN == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_BEGIN); - assert(SND_SEQ_EVENT_INSTR_END == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_END); - assert(SND_SEQ_EVENT_INSTR_INFO == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_INFO); - assert(SND_SEQ_EVENT_INSTR_INFO_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_INFO_RESULT); - assert(SND_SEQ_EVENT_INSTR_FINFO == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_FINFO); - assert(SND_SEQ_EVENT_INSTR_FINFO_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_FINFO_RESULT); - assert(SND_SEQ_EVENT_INSTR_RESET == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_RESET); - assert(SND_SEQ_EVENT_INSTR_STATUS == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_STATUS); - assert(SND_SEQ_EVENT_INSTR_STATUS_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_STATUS_RESULT); - assert(SND_SEQ_EVENT_INSTR_PUT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_PUT); - assert(SND_SEQ_EVENT_INSTR_GET == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_GET); - assert(SND_SEQ_EVENT_INSTR_GET_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_GET_RESULT); - assert(SND_SEQ_EVENT_INSTR_FREE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_FREE); - assert(SND_SEQ_EVENT_INSTR_LIST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_LIST); - assert(SND_SEQ_EVENT_INSTR_LIST_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_LIST_RESULT); - assert(SND_SEQ_EVENT_INSTR_CLUSTER == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CLUSTER); - assert(SND_SEQ_EVENT_INSTR_CLUSTER_GET == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CLUSTER_GET); - assert(SND_SEQ_EVENT_INSTR_CLUSTER_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CLUSTER_RESULT); - assert(SND_SEQ_EVENT_INSTR_CHANGE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CHANGE); assert(SND_SEQ_EVENT_SYSEX == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SYSEX); assert(SND_SEQ_EVENT_BOUNCE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_BOUNCE); assert(SND_SEQ_EVENT_USR_VAR0 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR_VAR0); diff -urd kaffe-1.1.8.orig/libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeq.java kaffe-1.1.8/libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeq.java --- kaffe-1.1.8.orig/libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java 2006-07-17 00:55:01.000000000 +0200 +++ kaffe-1.1.8/libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java 2008-04-05 19:22:40.000000000 +0200 @@ -118,18 +118,7 @@ public static final int SND_SEQ_EVENT_PORT_SUBSCRIBED = 66; /* read port is subscribed */ public static final int SND_SEQ_EVENT_PORT_UNSUBSCRIBED = 67; /* read port is released */ -/* 70-79: synthesizer events - * event data type = snd_seq_eve_sample_control_t - */ - public static final int SND_SEQ_EVENT_SAMPLE = 70; /* sample select */ - public static final int SND_SEQ_EVENT_SAMPLE_CLUSTER = 71; /* sample cluster select */ - public static final int SND_SEQ_EVENT_SAMPLE_START = 72; /* voice start */ - public static final int SND_SEQ_EVENT_SAMPLE_STOP = 73; /* voice stop */ - public static final int SND_SEQ_EVENT_SAMPLE_FREQ = 74; /* playback frequency */ - public static final int SND_SEQ_EVENT_SAMPLE_VOLUME = 75; /* volume and balance */ - public static final int SND_SEQ_EVENT_SAMPLE_LOOP = 76; /* sample loop */ - public static final int SND_SEQ_EVENT_SAMPLE_POSITION = 77; /* sample position */ - public static final int SND_SEQ_EVENT_SAMPLE_PRIVATE1 = 78; /* private (hardware dependent) event */ +/* 70-79: synthesizer events [removed in libasound2 1.0.16] */ /* 80-89: reserved */ @@ -147,29 +136,7 @@ public static final int SND_SEQ_EVENT_USR8 = 98; public static final int SND_SEQ_EVENT_USR9 = 99; -/* 100-129: instrument layer - * variable length data can be passed directly to the driver - */ - public static final int SND_SEQ_EVENT_INSTR_BEGIN = 100; /* begin of instrument management */ - public static final int SND_SEQ_EVENT_INSTR_END = 101; /* end of instrument management */ - public static final int SND_SEQ_EVENT_INSTR_INFO = 102; /* instrument interface info */ - public static final int SND_SEQ_EVENT_INSTR_INFO_RESULT = 103; /* result */ - public static final int SND_SEQ_EVENT_INSTR_FINFO = 104; /* get format info */ - public static final int SND_SEQ_EVENT_INSTR_FINFO_RESULT = 105; /* get format info */ - public static final int SND_SEQ_EVENT_INSTR_RESET = 106; /* reset instrument memory */ - public static final int SND_SEQ_EVENT_INSTR_STATUS = 107; /* instrument interface status */ - public static final int SND_SEQ_EVENT_INSTR_STATUS_RESULT = 108; /* result */ - public static final int SND_SEQ_EVENT_INSTR_PUT = 109; /* put instrument to port */ - public static final int SND_SEQ_EVENT_INSTR_GET = 110; /* get instrument from port */ - public static final int SND_SEQ_EVENT_INSTR_GET_RESULT = 111; /* result */ - public static final int SND_SEQ_EVENT_INSTR_FREE = 112; /* free instrument(s) */ - public static final int SND_SEQ_EVENT_INSTR_LIST = 113; /* instrument list */ - public static final int SND_SEQ_EVENT_INSTR_LIST_RESULT = 114; /* result */ - public static final int SND_SEQ_EVENT_INSTR_CLUSTER = 115; /* cluster parameters */ - public static final int SND_SEQ_EVENT_INSTR_CLUSTER_GET = 116; /* get cluster parameters */ - public static final int SND_SEQ_EVENT_INSTR_CLUSTER_RESULT = 117; /* result */ - public static final int SND_SEQ_EVENT_INSTR_CHANGE = 118; /* instrument change */ -/* 119-129: reserved */ +/* 100-129: instrument layer [removed in libasound2 1.0.16] */ /* 130-139: variable length events * event data type = snd_seq_ev_ext