Changeset 333

Show
Ignore:
Timestamp:
01/30/06 15:52:37 (3 years ago)
Author:
conrad
Message:

update to current remix and evas apis, build, x11 version runs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • beatfish/trunk/src/beatfish.c

    r331 r333  
    1818 
    1919#include <pthread.h> 
    20 #include <remix.h> 
     20#include <remix/remix.h> 
    2121#include <jack/jack.h> 
    2222 
    …… 
    134134 
    135135  mix_deck = remix_deck_new (remix); 
    136   mix_track = remix_add_track (remix, mix_deck); 
     136  mix_track = remix_track_new (remix, mix_deck); 
    137137   
    138   drums_layer = remix_add_layer_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
    139   remix_add_sound (remix, (RemixBase *)drums_deck, drums_layer, 
    140                   REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
     138  drums_layer = remix_layer_new_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
     139  remix_sound_new (remix, (RemixBase *)drums_deck, drums_layer, 
     140                  REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
    141141 
    142142  envelope = remix_envelope_new (remix, REMIX_ENVELOPE_LINEAR); 
    …… 
    156156    remix_set_parameter (remix, delay1_fx, 2, CD_FLOAT(0.2)); /* Feedback */ 
    157157 
    158     delay_layer = remix_add_layer_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
    159     sound = remix_add_sound (remix, delay1_fx, delay_layer, 
    160                             REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
     158    delay_layer = remix_layer_new_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
     159    sound = remix_sound_new (remix, delay1_fx, delay_layer, 
     160                            REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
    161161    /*  remix_sound_set_blend_envelope (remix, sound, envelope);*/ 
    162162   
    …… 
    166166    remix_set_parameter (remix, delay2_fx, 2, CD_FLOAT(0.1)); /* Feedback */ 
    167167 
    168     delay_layer = remix_add_layer_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
    169     sound = remix_add_sound (remix, delay2_fx, delay_layer, 
    170                             REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
     168    delay_layer = remix_layer_new_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
     169    sound = remix_sound_new (remix, delay2_fx, delay_layer, 
     170                            REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
    171171    /*remix_sound_set_blend_envelope (remix, sound, envelope);*/ 
    172172  } 
    …… 
    186186    remix_set_parameter (remix, vcf303_fx, 4, CD_FLOAT(0.3)); /* Decay */ 
    187187   
    188     vcf303_layer = remix_add_layer_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
    189     remix_add_sound (remix, vcf303_fx, vcf303_layer, 
    190                     REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
     188    vcf303_layer = remix_layer_new_ontop (remix, mix_track, REMIX_TIME_BEAT24S); 
     189    remix_sound_new (remix, vcf303_fx, vcf303_layer, 
     190                    REMIX_BEAT24S(0), REMIX_BEAT24S(LOOP_LEN)); 
    191191  } 
    192192 
    …… 
    755755               Evas_Event_Mouse_Up * ev) 
    756756{ 
    757   double ox, oy; 
     757  Evas_Coord ox, oy; 
    758758  int beat; 
    759759 
    …… 
    770770{ 
    771771  RemixBase * sound; 
    772   double ox, oy, nx; 
     772  Evas_Coord ox, oy, nx; 
    773773  int beat; 
    774774   
    …… 
    819819 
    820820    pthread_mutex_lock (&render_lock); 
    821     sound = remix_add_sound (remix, md->sf_base, md->layer, 
    822                             REMIX_BEAT24S(beat), REMIX_BEAT24S(12)); 
     821    sound = remix_sound_new (remix, md->sf_base, md->layer, 
     822                            REMIX_BEAT24S(beat), REMIX_BEAT24S(12)); 
    823823    pthread_mutex_unlock (&render_lock); 
    824824 
    …… 
    841841  double track_y; 
    842842 
    843   track = remix_add_track (remix, drums_deck); 
     843  track = remix_track_new (remix, drums_deck); 
    844844  remix_track_set_gain (remix, track, gain); 
    845845 
    846   layer = remix_add_layer_ontop (remix, track, REMIX_TIME_BEAT24S); 
     846  layer = remix_layer_new_ontop (remix, track, REMIX_TIME_BEAT24S); 
    847847 
    848848  track_y = HEIGHT/2 + index * HEIGHT / (2 * 8); 

  • beatfish/trunk/src/evas_software_gtk2_main.c

    r331 r333  
    2626evasgtk2_button_press (GtkWidget * widget, GdkEventButton * event, Evas * evas) 
    2727{ 
    28   evas_event_feed_mouse_move (evas, event->x, event->y); 
    29   evas_event_feed_mouse_down (evas, event->button); 
     28  evas_event_feed_mouse_move (evas, event->x, event->y, 0, NULL); 
     29  evas_event_feed_mouse_down (evas, event->button, EVAS_BUTTON_NONE, 0, NULL); 
    3030} 
    3131 
    …… 
    3434                         Evas * evas) 
    3535{ 
    36   evas_event_feed_mouse_move (evas, event->x, event->y); 
    37   evas_event_feed_mouse_up (evas, event->button); 
     36  evas_event_feed_mouse_move (evas, event->x, event->y, 0, NULL); 
     37  evas_event_feed_mouse_up (evas, event->button, EVAS_BUTTON_NONE, 0, NULL); 
    3838} 
    3939 
    …… 
    4141evasgtk2_motion (GtkWidget * widget, GdkEventMotion * event, Evas * evas) 
    4242{ 
    43   evas_event_feed_mouse_move (evas, event->x, event->y); 
     43  evas_event_feed_mouse_move (evas, event->x, event->y, 0, NULL); 
    4444} 
    4545 

  • beatfish/trunk/src/evas_software_x11_main.c

    r331 r333  
    2929   attr.event_mask = 
    3030      ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | 
     31      EnterWindowMask | LeaveWindowMask | 
    3132      StructureNotifyMask; 
    3233   attr.bit_gravity = ForgetGravity; 
    …… 
    5051   XSync(disp, False); 
    5152 
     53   evas_init(); 
    5254   evas = evas_new(); 
    5355   evas_output_method_set(evas, evas_render_method_lookup("software_x11")); 
    …… 
    7880                               ExposureMask | 
    7981                               StructureNotifyMask | 
     82                               EnterWindowMask | LeaveWindowMask | 
    8083                               KeyPressMask | 
    8184                               KeyReleaseMask | 
    …… 
    8588             switch (ev.type) 
    8689               { 
     90               case EnterNotify: 
     91                   evas_event_feed_mouse_in (evas, 0, NULL); 
     92                   break; 
     93               case LeaveNotify: 
     94                   evas_event_feed_mouse_out (evas, 0, NULL); 
     95                   break; 
    8796               case ButtonPress: 
    8897#if 0 
    …… 
    99108                     pause_me = 1; 
    100109#endif             
    101                   evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y); 
    102                   evas_event_feed_mouse_down(evas, ev.xbutton.button); 
     110                  evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, 0, NULL); 
     111                  evas_event_feed_mouse_down(evas, ev.xbutton.button, EVAS_BUTTON_NONE, 0, NULL); 
    103112                  break; 
    104113               case ButtonRelease: 
    105                   evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y); 
    106                   evas_event_feed_mouse_up(evas, ev.xbutton.button); 
     114                  evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, 0, NULL); 
     115                  evas_event_feed_mouse_up(evas, ev.xbutton.button, EVAS_BUTTON_NONE, 0, NULL); 
    107116                  break; 
    108117               case MotionNotify: 
    109                   evas_event_feed_mouse_move(evas, ev.xmotion.x, ev.xmotion.y); 
     118                  evas_event_feed_mouse_move(evas, ev.xmotion.x, ev.xmotion.y, 0, NULL); 
    110119                  break; 
    111120               case Expose: