Changeset 364
- Timestamp:
- 02/23/06 19:38:21 (3 years ago)
- Files:
-
- beatfish/trunk/src/beatfish.c (modified) (25 diffs)
- beatfish/trunk/src/jack.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
beatfish/trunk/src/beatfish.c
r363 r364 56 56 char * progname = "Beatfish"; 57 57 58 RemixEnv * remix; 59 RemixDeck * mix_deck; 60 58 61 Evas *evas = NULL; 59 Evas_Object * cursor;60 62 61 63 int win_w = WIDTH; 62 64 int win_h = HEIGHT; 63 65 64 RemixEnv * remix; 65 RemixDeck * drums_deck, * mix_deck; 66 67 RemixSquareTone * square1, * square2; 68 RemixBase * kick_sf, * snare_sf, * congahigh_sf, * congalow_sf, 66 static Evas_Object * cursor; 67 68 static RemixDeck * drums_deck; 69 70 static RemixSquareTone * square1, * square2; 71 static RemixBase * kick_sf, * snare_sf, * congahigh_sf, * congalow_sf, 69 72 * closedhat_sf, * openhat_sf, * clap_sf, * clave_sf; 70 73 71 RemixTrack * mix_track; 72 RemixLayer * drums_layer, * delay_layer, * vcf303_layer, * monitor_layer; 73 74 RemixBase * delay1_fx, * delay2_fx, * vcf303_fx; 75 RemixMonitor * monitor; 76 77 float delay1_x, delay2_x; 78 79 RemixBase * 74 static RemixTrack * mix_track; 75 static RemixLayer * drums_layer, * delay_layer, * vcf303_layer, * monitor_layer; 76 77 static RemixBase * delay1_fx, * delay2_fx, * vcf303_fx; 78 79 #ifdef _USE_MONITOR_ 80 static RemixMonitor * monitor; 81 #endif 82 83 static float delay1_x, delay2_x; 84 85 static RemixBase * 80 86 sndfile_reader_new (char * pathname) 81 87 { … … 199 205 200 206 #if 0 201 void207 static void 202 208 zoom_in (void) 203 209 { … … 220 226 } 221 227 222 void228 static void 223 229 zoom_out (void) 224 230 { … … 259 265 } 260 266 261 void267 static void 262 268 delay_reset (RemixBase * delay_fx, float canvas_x) 263 269 { … … 274 280 static Evas_Object * tempo_label; 275 281 276 void282 static void 277 283 tempo_set_x (Evas_Object * slider, float canvas_x) 278 284 { … … 294 300 } 295 301 296 void302 static void 297 303 tempo_mouse_down(void *data, Evas * e, Evas_Object * obj, 298 304 Evas_Event_Mouse_Down * ev) … … 304 310 } 305 311 306 void312 static void 307 313 tempo_mouse_move (void *data, Evas * e, Evas_Object * obj, 308 314 Evas_Event_Mouse_Move * ev) … … 315 321 } 316 322 317 void323 static void 318 324 tempo_mouse_up (void *data, Evas * e, Evas_Object * obj, 319 325 Evas_Event_Mouse_Move * ev) … … 382 388 }; 383 389 384 void390 static void 385 391 vcf303_set_x (MD_VCF303 * md, float canvas_x) 386 392 { … … 394 400 } 395 401 396 void402 static void 397 403 vcf303_mouse_down(void *data, Evas * e, Evas_Object * obj, 398 404 Evas_Event_Mouse_Down * ev) … … 405 411 } 406 412 407 void413 static void 408 414 vcf303_mouse_move (void *data, Evas * e, Evas_Object * obj, 409 415 Evas_Event_Mouse_Move * ev) … … 416 422 } 417 423 418 void424 static void 419 425 vcf303_mouse_up (void *data, Evas * e, Evas_Object * obj, 420 426 Evas_Event_Mouse_Move * ev) … … 512 518 /* Scrub */ 513 519 514 void520 static void 515 521 scrub_set_x (float canvas_x) 516 522 { … … 526 532 } 527 533 528 void534 static void 529 535 scrub_mouse_down(void *data, Evas * e, Evas_Object * obj, 530 536 Evas_Event_Mouse_Down * ev) … … 535 541 } 536 542 537 void543 static void 538 544 scrub_mouse_move (void *data, Evas * e, Evas_Object * obj, 539 545 Evas_Event_Mouse_Move * ev) … … 544 550 } 545 551 546 void552 static void 547 553 scrub_mouse_up (void *data, Evas * e, Evas_Object * obj, 548 554 Evas_Event_Mouse_Move * ev) … … 595 601 }; 596 602 597 void603 static void 598 604 delay_set_x (MD_Delay * md, float canvas_x) 599 605 { … … 603 609 } 604 610 605 void611 static void 606 612 delay_mouse_down(void *data, Evas * e, Evas_Object * obj, 607 613 Evas_Event_Mouse_Down * ev) … … 625 631 } 626 632 627 void633 static void 628 634 delay_mouse_move (void *data, Evas * e, Evas_Object * obj, 629 635 Evas_Event_Mouse_Move * ev) … … 636 642 } 637 643 638 void644 static void 639 645 delay_mouse_up (void *data, Evas * e, Evas_Object * obj, 640 646 Evas_Event_Mouse_Move * ev) … … 731 737 }; 732 738 733 void739 static void 734 740 sound_mouse_down(void *data, Evas * e, Evas_Object * obj, 735 741 Evas_Event_Mouse_Down * ev) … … 750 756 } 751 757 752 void758 static void 753 759 sound_mouse_up(void *data, Evas * e, Evas_Object * obj, 754 760 Evas_Event_Mouse_Up * ev) … … 764 770 } 765 771 766 void772 static void 767 773 sound_mouse_move(void *data, Evas * e, Evas_Object * obj, 768 774 Evas_Event_Mouse_Move * ev) … … 786 792 } 787 793 788 void794 static void 789 795 track_mouse_down(void *data, Evas * e, Evas_Object * obj, 790 796 Evas_Event_Mouse_Down * ev) … … 897 903 } 898 904 899 void905 static void 900 906 setup_gui (void) 901 907 { beatfish/trunk/src/jack.c
r363 r364 28 28 extern char * progname; 29 29 30 jack_port_t * output_port;31 RemixStream * output_stream = NULL;30 static jack_port_t * output_port; 31 static RemixStream * output_stream = NULL; 32 32 static jack_nframes_t last_nframes = 0; 33 33 static RemixPCM * last_pcm = NULL; 34 34 static RemixPCM * pcm = NULL; 35 35 36 int36 static int 37 37 beatfish_process (jack_nframes_t nframes, void * arg) 38 38 { … … 65 65 } 66 66 67 void67 static void 68 68 beatfish_shutdown (void * arg) 69 69 {
