Changeset 321

Show
Ignore:
Timestamp:
01/25/06 12:57:07 (3 years ago)
Author:
conrad
Message:

make it build against libremix trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scrubbery/trunk/Makefile.am

    r1 r321  
    11SUBDIRS = src 
    22 
    3 EXTRA_DIST=beatfish.lsm.in beatfish.spec.in beatfish.1 
     3EXTRA_DIST=scrubbery.lsm.in scrubbery.spec.in scrubbery.1 
    44 
    55#  install the man pages 
    6 man_MANS=beatfish.1 
     6man_MANS=scrubbery.1 
    77 
    88install-data-local: 

  • scrubbery/trunk/Makefile.in

    r1 r321  
    189189target_vendor = @target_vendor@ 
    190190SUBDIRS = src 
    191 EXTRA_DIST = beatfish.lsm.in beatfish.spec.in beatfish.1 
     191EXTRA_DIST = scrubbery.lsm.in scrubbery.spec.in scrubbery.1 
    192192 
    193193#  install the man pages 
    194 man_MANS = beatfish.1 
     194man_MANS = scrubbery.1 
    195195all: config.h 
    196196        $(MAKE) $(AM_MAKEFLAGS) all-recursive 

  • scrubbery/trunk/src/Makefile.am

    r1 r321  
    33INCLUDES = @REMIX_CFLAGS@ @EVAS_CFLAGS@ @GTK2_CFLAGS@ 
    44 
    5 bin_PROGRAMS = scrubbery 
    6 #@GTK2_TARGETS@ 
     5#bin_PROGRAMS = scrubbery @GTK2_TARGETS@ 
    76#EXTRA_PROGRAMS = scrubbery-gtk 
     7bin_PROGRAMS = @GTK2_TARGETS@ 
     8EXTRA_PROGRAMS = scrubbery-gtk 
    89 
    910scrubbery_SOURCES = \ 
    …… 
    1213scrubbery_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ 
    1314 
    14 #scrubbery_gtk_SOURCES = \ 
    15 #     scrubbery.h scrubbery.c evas_software_gtk2_main.c 
    16 # 
    17 #scrubbery_gtk_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ @GTK2_LIBS@ 
     15scrubbery_gtk_SOURCES = \ 
     16      scrubbery.h scrubbery.c evas_software_gtk2_main.c 
     17 
     18scrubbery_gtk_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ @GTK2_LIBS@ 

  • scrubbery/trunk/src/Makefile.in

    r1 r321  
    1515@SET_MAKE@ 
    1616 
    17 SOURCES = $(scrubbery_SOURCES) 
     17SOURCES = $(scrubbery_gtk_SOURCES) 
    1818 
    1919srcdir = @srcdir@ 
    …… 
    3838POST_UNINSTALL = : 
    3939host_triplet = @host@ 
    40 bin_PROGRAMS = scrubbery$(EXEEXT) 
     40bin_PROGRAMS = @GTK2_TARGETS@ 
     41EXTRA_PROGRAMS = scrubbery-gtk$(EXEEXT) 
    4142subdir = src 
    4243DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    …… 
    5253binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 
    5354PROGRAMS = $(bin_PROGRAMS) 
    54 am_scrubbery_OBJECTS = scrubbery.$(OBJEXT) \ 
    55         evas_software_x11_main.$(OBJEXT) 
    56 scrubbery_OBJECTS = $(am_scrubbery_OBJECTS) 
    57 scrubbery_DEPENDENCIES = 
     55am_scrubbery_gtk_OBJECTS = scrubbery.$(OBJEXT) \ 
     56        evas_software_gtk2_main.$(OBJEXT) 
     57scrubbery_gtk_OBJECTS = $(am_scrubbery_gtk_OBJECTS) 
     58scrubbery_gtk_DEPENDENCIES = 
    5859DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    5960depcomp = $(SHELL) $(top_srcdir)/depcomp 
    6061am__depfiles_maybe = depfiles 
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evas_software_x11_main.Po \ 
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evas_software_gtk2_main.Po \ 
    6263@AMDEP_TRUE@    ./$(DEPDIR)/scrubbery.Po 
    6364COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    …… 
    6970LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 
    7071        $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    71 SOURCES = $(scrubbery_SOURCES) 
    72 DIST_SOURCES = $(scrubbery_SOURCES) 
     72SOURCES = $(scrubbery_gtk_SOURCES) 
     73DIST_SOURCES = $(scrubbery_gtk_SOURCES) 
    7374ETAGS = etags 
    7475CTAGS = ctags 
    …… 
    185186target_vendor = @target_vendor@ 
    186187INCLUDES = @REMIX_CFLAGS@ @EVAS_CFLAGS@ @GTK2_CFLAGS@ 
    187 #@GTK2_TARGETS@ 
    188 #EXTRA_PROGRAMS = scrubbery-gtk 
    189188scrubbery_SOURCES = \ 
    190189        scrubbery.h scrubbery.c evas_software_x11_main.c 
    191190 
    192191scrubbery_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ 
     192scrubbery_gtk_SOURCES = \ 
     193        scrubbery.h scrubbery.c evas_software_gtk2_main.c 
     194 
     195scrubbery_gtk_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ @GTK2_LIBS@ 
    193196all: all-am 
    194197 
    …… 
    252255          rm -f $$p $$f ; \ 
    253256        done 
    254 scrubbery$(EXEEXT): $(scrubbery_OBJECTS) $(scrubbery_DEPENDENCIES)  
    255         @rm -f scrubbery$(EXEEXT) 
    256         $(LINK) $(scrubbery_LDFLAGS) $(scrubbery_OBJECTS) $(scrubbery_LDADD) $(LIBS) 
     257scrubbery-gtk$(EXEEXT): $(scrubbery_gtk_OBJECTS) $(scrubbery_gtk_DEPENDENCIES)  
     258        @rm -f scrubbery-gtk$(EXEEXT) 
     259        $(LINK) $(scrubbery_gtk_LDFLAGS) $(scrubbery_gtk_OBJECTS) $(scrubbery_gtk_LDADD) $(LIBS) 
    257260 
    258261mostlyclean-compile: 
    …… 
    262265        -rm -f *.tab.c 
    263266 
    264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_software_x11_main.Po@am__quote@ 
     267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_software_gtk2_main.Po@am__quote@ 
    265268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrubbery.Po@am__quote@ 
    266269 
    …… 
    467470        uninstall-binPROGRAMS uninstall-info-am 
    468471 
    469  
    470 #scrubbery_gtk_SOURCES = \ 
    471 #       scrubbery.h scrubbery.c evas_software_gtk2_main.c 
    472 # 
    473 #scrubbery_gtk_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ @GTK2_LIBS@ 
    474472# Tell versions [3.59,3.63) of GNU make to not export all variables. 
    475473# Otherwise a system limit (for SysV at least) may be exceeded. 

  • scrubbery/trunk/src/evas_software_gtk2_main.c

    r1 r321  
    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, 0, 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, 0, 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 
    …… 
    130130main(int argc, char **argv) 
    131131{ 
     132  char * infilename; 
    132133  Display * disp; 
    133134  GtkWidget * window; 
    134135 
    135136  GtkWidget * evasgtk2; 
     137 
     138  if (argc < 2) { 
     139    printf ("Usage: scrubbery file\n"); 
     140  } 
     141  infilename = argv[1]; 
    136142 
    137143  gtk_init (&argc, &argv); 
    …… 
    150156  evas = evasgtk2_attach (evasgtk2, win_w, win_h); 
    151157 
    152   setup (); 
     158  setup (infilename); 
    153159 
    154160  gtk_timeout_add (10, (GtkFunction)update_cursor_timeout, disp); 

  • scrubbery/trunk/src/evas_software_x11_main.c

    r1 r321  
    110110#endif 
    111111               case EnterNotify: 
    112                  evas_event_feed_mouse_in (evas, NULL); 
     112                 evas_event_feed_mouse_in (evas, 0, NULL); 
    113113                 break; 
    114114               case LeaveNotify: 
    115                  evas_event_feed_mouse_out (evas, NULL); 
     115                 evas_event_feed_mouse_out (evas, 0, NULL); 
    116116                 break; 
    117117               case ButtonPress: 
    …… 
    129129                     pause_me = 1; 
    130130#endif             
    131                   evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, NULL); 
    132                   evas_event_feed_mouse_down(evas, ev.xbutton.button, EVAS_BUTTON_NONE, NULL); 
     131                  evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, 0, NULL); 
     132                  evas_event_feed_mouse_down(evas, ev.xbutton.button, EVAS_BUTTON_NONE, 0, NULL); 
    133133                  break; 
    134134               case ButtonRelease: 
    135                   evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, NULL); 
    136                   evas_event_feed_mouse_up(evas, ev.xbutton.button, EVAS_BUTTON_NONE, NULL); 
     135                  evas_event_feed_mouse_move(evas, ev.xbutton.x, ev.xbutton.y, 0, NULL); 
     136                  evas_event_feed_mouse_up(evas, ev.xbutton.button, EVAS_BUTTON_NONE, 0, NULL); 
    137137                  break; 
    138138               case MotionNotify: 
    139                   evas_event_feed_mouse_move(evas, ev.xmotion.x, ev.xmotion.y, NULL); 
     139                  evas_event_feed_mouse_move(evas, ev.xmotion.x, ev.xmotion.y, 0, NULL); 
    140140                  break; 
    141141               case Expose: 

  • scrubbery/trunk/src/scrubbery.c

    r1 r321  
    215215#endif 
    216216 
     217#if 0 
    217218  scrubby = remix_scrubby_new (remix); 
    218219 
    …… 
    226227 
    227228  remix_scrubby_set_source (remix, scrubby, mix_deck); 
    228  
     229#endif 
    229230} 
    230231 
    …… 
    582583} 
    583584 
     585#if 0 
    584586void 
    585587scrub_key_down (void *data, Evas * e, Evas_Object * obj, 
    …… 
    600602  printf ("Key %s up\n", ev->keyname); 
    601603} 
     604#endif 
    602605 
    603606static void 
    …… 
    623626                                 (Evas_Event_Callback)scrub_mouse_down, NULL);*/ 
    624627  evas_object_event_callback_add(bg, EVAS_CALLBACK_MOUSE_DOWN, 
    625                                  scrub_mouse_down, NULL); 
     628                                 (Evas_Event_Callback)scrub_mouse_down, NULL); 
    626629  evas_object_event_callback_add(bg, EVAS_CALLBACK_MOUSE_UP, 
    627630                                 (Evas_Event_Callback)scrub_mouse_up, NULL); 
    …… 
    629632                                 (Evas_Event_Callback)scrub_mouse_move, NULL); 
    630633 
     634#if 0 
    631635  evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, 
    632636                                 (Evas_Event_Callback)scrub_key_down, NULL); 
    633637  evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_UP, 
    634638                                 (Evas_Event_Callback)scrub_key_up, NULL); 
     639#endif 
    635640   
    636641#if 0 
    …… 
    815820               Evas_Event_Mouse_Up * ev) 
    816821{ 
    817   double ox, oy; 
     822  Evas_Coord ox, oy; 
    818823  int beat; 
    819824 
    …… 
    830835{ 
    831836  RemixBase * sound; 
    832   double ox, oy, nx; 
     837  Evas_Coord ox, oy, nx; 
    833838  int beat; 
    834839