Changeset 355

Show
Ignore:
Timestamp:
02/08/06 20:56:57 (3 years ago)
Author:
kickback
Message:

sweep-jack-testing: sync with trunk. all related changesets from 304 to 353.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/branches/sweep-jack-testing/AUTHORS

    r303 r355  
    104104======= 
    105105 
     106Pascal Klein <4pascal@tpg.com.au> 
     107        About dialog image  (0.9.2) 
     108 
    106109Mike Oliphant 
    107110        Transport button pixmaps (adapted from Grip) 

  • sweep/branches/sweep-jack-testing/ChangeLog

    r204 r355  
     1Mon Jan 30 23:58:00 GMT 2006 Peter Shorthose <kickback@users.sourceforge.net> 
     2 
     3        * fixed --enable-alsa configure option 
     4        * released 0.9.1 
     5 
     6Wed Jan 18 04:10:00 GMT 2006 Peter Shorthose <kickback@users.sourceforge.net> 
     7 
     8        * ported the interface to gtk+-2.0 
     9        * mp3 loading and playback whilst loading bugs fixed 
     10        * corrected a note to key mapping for pc keyboard playback (Paul Brossier) 
     11        * a new SVG icon for sweep (Alex Kloss) 
     12        * an updated spanish translation (Waldo Ramirez Montano) 
     13        * an updated Polish translation (Radoslaw Korzeniewski) 
     14        * more minor tweaks and improvements. 
     15        * released 0.9.0 
     16 
    117Mon Aug 22 21:54:30 EST 2005 Conrad Parker <conrad@metadecks.org> 
    218 
    …… 
    427443        * added position indicator 
    428444        * added button pixmaps to toolbox and play/stop buttons 
    429  
    430  

  • sweep/branches/sweep-jack-testing/Makefile.am

    r183 r355  
    55SUBDIRS = m4 intl po include src plugins doc 
    66 
    7 pkgdata_DATA = sweep_logo.ppm 
     7pkgdata_DATA = sweep_splash.png 
    88 
    99desktop_DATA = sweep.desktop 
    10 desktopdir = $(datadir)/gnome/apps/Multimedia 
     10desktopdir = $(datadir)/applications 
    1111 
    1212pixmapdir = $(datadir)/pixmaps 
    13 pixmap_DATA = sweep.png 
     13pixmap_DATA = sweep.svg 
    1414 
    1515EXTRA_DIST = config.rpath mkinstalldirs  $(desktop_DATA) $(pkgdata_DATA)  $(pixmap_DATA) \ 
    …… 
    4242          done \ 
    4343        fi 
    44  

  • sweep/branches/sweep-jack-testing/NEWS

    r204 r355  
     1Mon Jan 30 2006 -- Version 0.9.1 
     2-------------------------------- 
     3 
     4This is a maintainance release. 
     5 
     6The previous release (0.9.0) had a bug that prevented sweep from 
     7populating the ALSA devices in settings. The bug was only apparent 
     8when you built with ALSA and didn't have a previous installation 
     9of sweep that used ALSA. 
     10 
     11If you installed sweep 0.9.0 and had problems getting any sound 
     12output then please upgrade to 0.9.1. 
     13 
    114Mon Aug 22 2005 -- Version 0.8.4 
    215-------------------------------- 
    …… 
    341354 
    342355(Screenshots on this page show sweep version 0.0.6). 
    343  

  • sweep/branches/sweep-jack-testing/TODO

    r263 r355  
    99        * region list management 
    1010        * recording source management 
     11        * LADSPA browser 
     12        * modular drivers 
    1113 
    1214Done 

  • sweep/branches/sweep-jack-testing/configure.ac

    r293 r355  
    22 
    33AC_INIT(configure.ac) 
    4 AM_INIT_AUTOMAKE(sweep, 0.9.0) 
     4AM_INIT_AUTOMAKE(sweep, 0.9.1) 
    55AM_CONFIG_HEADER(config.h) 
    66 
    …… 
    369369if test "x${ac_enable_alsa}" != xno ; then 
    370370 
    371   AC_CHECK_HEADERS(alsa/asoundlib.h) 
    372   if test "x${ac_cv_header_alsa_asoundlib_h}" = xyes ; then 
    373     AC_DEFINE([DRIVER_ALSA], [], [Define if we have and want alsa.]) 
    374     LIBS="$LIBS -lasound" 
    375   fi 
    376  
     371  PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, 
     372                  HAVE_ALSA="yes", sweep_config_ok="no") 
     373  AC_SUBST(ALSA_CFLAGS) 
     374  AC_SUBST(ALSA_LIBS) 
     375  AC_DEFINE([DRIVER_ALSA], [], [Define if we have and want alsa.])  
     376  if test "x$HAVE_ALSA" != xyes ; then 
     377    AC_CHECK_LIB(asound, snd_seq_open, HAVE_ALSA="maybe", sweep_config_ok="no") 
     378  fi     
    377379  sweep_config_driver="ALSA" 
    378380fi 
    …… 
    571573if test "x$HAVE_LIBSNDFILE0" = xyes ; then 
    572574    AC_MSG_RESULT([ 
    573       Incorrect version: Your system appears to have an old 
     575      Development files missing: Your system appears to have an old 
    574576      version of libsndfile (below 1.0.0) installed. 
    575577]) 
    576578fi 
    577579 
    578 if test "x$HAVE_VORBIS" != xyes ; then 
     580if test "x$HAVE_ALSA" = xmaybe ; then 
    579581    AC_MSG_RESULT([ 
    580 *** Ogg Vorbis libraries, available from  http://www.xiph.org/ogg/vorbis/ 
    581 ]) 
    582 fi 
     582      Development files missing: alsa-lib 1.0.0 or greater seems to exist 
     583      on your system, however the pkg-config tool cannot find the 
     584      build information. 
     585]) 
     586fi 
     587 
     588if test "x$HAVE_ALSA" != xyes ; then 
     589  AC_MSG_RESULT([ 
     590*** alsa-lib version 1.0.0 or greater, available from 
     591*** http://alsa-project.org/ 
     592]) 
     593fi 
     594 
    583595if test "x$HAVE_VORBIS" = xmaybe ; then 
    584596    AC_MSG_RESULT([ 
    …… 
    587599      a test program failed. 
    588600]) 
    589 fi  
     601fi 
     602 
     603if test "x$HAVE_VORBIS" != xyes ; then 
     604    AC_MSG_RESULT([ 
     605*** Ogg Vorbis libraries, available from  http://www.xiph.org/ogg/vorbis/ 
     606]) 
     607fi 
     608 
    590609if test "x$HAVE_VORBIS" != xyes ; then 
    591610    AC_MSG_RESULT([ 
    …… 
    598617if test "x$HAVE_GLIB" = xmaybe || test "x$HAVE_GTK" = xmaybe || 
    599618   test "x$HAVE_LIBSNDFILE1" = xmaybe || test "x$HAVE_TDB" = xmaybe || 
    600    test "x$HAVE_GTHREADS" = xmaybe || 
     619   test "x$HAVE_GTHREADS" = xmaybe || test "x$HAVE_ALSA" = xmaybe || 
    601620   test "x$HAVE_OGG" = xmaybe || test "x$HAVE_VORBIS" = xmaybe ; then 
    602621  AC_MSG_RESULT([ 

  • sweep/branches/sweep-jack-testing/plugins/byenergy/Makefile.am

    r295 r355  
    1111libbyenergy_la_SOURCES = byenergy.c 
    1212libbyenergy_la_LDFLAGS = -avoid-version -module 
     13 
     14install: all 
     15        mkdir -p $(DESTDIR)/$(libdir) 
     16        $(INSTALL_PROGRAM) .libs/libbyenergy.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/plugins/echo/Makefile.am

    r295 r355  
    1111libecho_la_SOURCES = echo.c 
    1212libecho_la_LDFLAGS = -avoid-version -module 
     13 
     14install: all 
     15        mkdir -p $(DESTDIR)/$(libdir) 
     16        $(INSTALL_PROGRAM) .libs/libecho.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/plugins/fade/Makefile.am

    r295 r355  
    1010libfade_la_SOURCES = fade.c 
    1111libfade_la_LDFLAGS = -avoid-version -module  
     12 
     13install: all 
     14        mkdir -p $(DESTDIR)/$(libdir) 
     15        $(INSTALL_PROGRAM) .libs/libfade.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/plugins/ladspa/Makefile.am

    r295 r355  
    1111libladspameta_la_SOURCES = ladspameta.c ladspa.h 
    1212libladspameta_la_LDFLAGS = -avoid-version -module 
     13 
     14install: all 
     15        mkdir -p $(DESTDIR)/$(libdir) 
     16        $(INSTALL_PROGRAM) .libs/libladspameta.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/plugins/normalise/Makefile.am

    r295 r355  
    1010libnormalise_la_SOURCES = normalise.c 
    1111libnormalise_la_LDFLAGS = -avoid-version -module 
     12 
     13install: all 
     14        mkdir -p $(DESTDIR)/$(libdir) 
     15        $(INSTALL_PROGRAM) .libs/libnormalise.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/plugins/reverse/Makefile.am

    r295 r355  
    1212libreverse_la_LDFLAGS = -avoid-version -module 
    1313 
     14install: all 
     15        mkdir -p $(DESTDIR)/$(libdir) 
     16        $(INSTALL_PROGRAM) .libs/libreverse.so $(DESTDIR)/$(libdir); 

  • sweep/branches/sweep-jack-testing/src/Makefile.am

    r293 r355  
    1313        @GLIB_CFLAGS@ \ 
    1414        @GTHREADS_CFLAGS@ \ 
     15        @ALSA_CFLAGS@ \ 
    1516        @JACK_CFLAGS@ 
     17 
    1618TDB_LIBS = $(top_builddir)/src/tdb/libtdb.a 
    1719 
    …… 
    3133        driver_oss.c \ 
    3234        driver_solaris.c \ 
    33         driver_jack.c \ 
    3435        edit.c edit.h \ 
    3536        file_dialogs.c file_dialogs.h \ 
    …… 
    7677        $(MAD_LIBS) $(SPEEX_LIBS) \ 
    7778        $(SAMPLERATE_LIBS) \ 
    78         @GLIB_LIBS@ @GTHREADS_LIBS@ @JACK_LIBS@ 
     79        @GLIB_LIBS@ @GTHREADS_LIBS@ \ 
     80        @ALSA_LIBS@ @JACK_LIBS@ 
    7981 
    8082sweep_LDFLAGS = @EXPORT_DYNAMIC_FLAGS@ 

  • sweep/branches/sweep-jack-testing/src/about_dialog.c

    r265 r355  
    8585    gtk_box_pack_start(GTK_BOX(vbox), about_ebox, TRUE, TRUE, 0); 
    8686    gtk_widget_show(about_ebox); 
    87     sprintf(buf2, "%s/sweep_logo.ppm", PACKAGE_DATA_DIR); 
     87    sprintf(buf2, "%s/sweep_splash.png", PACKAGE_DATA_DIR); 
    8888    about_image = gtk_image_new_from_file (buf2); 
    8989    gtk_container_add(GTK_CONTAINER(about_ebox), about_image); 

  • sweep/branches/sweep-jack-testing/src/db_ruler.c

    r282 r355  
    6767db_ruler_leave_notify (GtkWidget * widget, GdkEventCrossing * event); 
    6868 
     69static gboolean db_ruler_scroll_event (GtkWidget * widget, GdkEventScroll *event); 
     70 
    6971static void db_ruler_draw_ticks    (GtkRuler       *ruler); 
    7072static void db_ruler_draw_pos      (GtkRuler       *ruler); 
    …… 
    118120  ruler_class = (GtkRulerClass*) klass; 
    119121 
     122  widget_class->realize = db_ruler_realize; 
    120123  widget_class->button_press_event = db_ruler_button_press; 
    121124  widget_class->motion_notify_event = db_ruler_motion_notify; 
    122125  widget_class->button_release_event = db_ruler_button_release; 
    123126  widget_class->leave_notify_event = db_ruler_leave_notify; 
     127  widget_class->scroll_event = db_ruler_scroll_event; 
    124128 
    125129  ruler_class->draw_ticks = db_ruler_draw_ticks; 
    …… 
    157161} 
    158162 
     163static void 
     164db_ruler_realize (GtkWidget * widget) 
     165{ 
     166  GtkRuler * ruler; 
     167  GdkWindowAttr attributes; 
     168  gint attributes_mask; 
     169  GdkVisual * visual; 
     170 
     171  g_return_if_fail (widget != NULL); 
     172  g_return_if_fail (GTK_IS_DB_RULER (widget)); 
     173 
     174  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); 
     175 
     176  ruler = GTK_RULER(widget); 
     177 
     178  attributes.x = widget->allocation.x; 
     179  attributes.y = widget->allocation.y; 
     180  attributes.width = widget->allocation.width; 
     181  attributes.height = widget->allocation.height; 
     182  attributes.wclass = GDK_INPUT_OUTPUT; 
     183  attributes.window_type = GDK_WINDOW_CHILD; 
     184  attributes.event_mask = gtk_widget_get_events (widget) 
     185    | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 
     186    | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK 
     187    | GDK_LEAVE_NOTIFY_MASK | GDK_SCROLL_MASK; 
     188 
     189  attributes.visual = gtk_widget_get_visual (widget); 
     190  attributes.colormap = gtk_widget_get_colormap (widget); 
     191 
     192  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; 
     193  widget->window = gdk_window_new (widget->parent->window, 
     194                                   &attributes, attributes_mask); 
     195 
     196  widget->style = gtk_style_attach (widget->style, widget->window); 
     197 
     198  gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); 
     199 
     200  gdk_window_set_user_data(widget->window, widget); 
     201 
     202  visual = gdk_window_get_visual (widget->window); 
     203 
     204  if (ruler->backing_store != NULL) { 
     205    gdk_pixmap_unref (ruler->backing_store); 
     206  } 
     207 
     208  ruler->backing_store = gdk_pixmap_new (widget->window, 
     209                                         widget->allocation.width, 
     210                                         widget->allocation.height, 
     211                                         visual->depth); 
     212 
     213  ruler->non_gr_exp_gc = gdk_gc_new (widget->window); 
     214  gdk_gc_copy (ruler->non_gr_exp_gc, widget->style->fg_gc[GTK_STATE_NORMAL]); 
     215} 
     216 
    159217GtkWidget* 
    160218db_ruler_new (void) 
    …… 
    215273db_ruler_button_press (GtkWidget * widget, GdkEventButton * event) 
    216274{ 
    217   GtkRuler * ruler = GTK_RULER(widget); 
    218   int y; 
    219   float delta; 
     275   int y; 
    220276 
    221277  gdk_window_get_pointer (event->window, NULL, &y, NULL); 
    …… 
    226282    DB_RULER(widget)->dragging = TRUE; 
    227283    break; 
    228   case 4: 
    229     delta = ruler->upper - ruler->lower; 
     284  default: 
     285    break; 
     286  } 
     287 
     288  return TRUE; 
     289} 
     290 
     291static gint 
     292db_ruler_button_release (GtkWidget * widget, GdkEventButton * event) 
     293{ 
     294  DB_RULER(widget)->dragging = FALSE; 
     295 
     296  return TRUE; 
     297} 
     298 
     299static gboolean 
     300db_ruler_scroll_event (GtkWidget *widget, GdkEventScroll *event) 
     301{ 
     302  GtkRuler * ruler = GTK_RULER(widget); 
     303  float delta; 
     304 
     305  if (event->direction == GDK_SCROLL_UP) {    /* mouse wheel scroll up */ 
     306         
     307        delta = ruler->upper - ruler->lower; 
    230308    gtk_ruler_set_range (ruler, ruler->lower + delta/8, ruler->upper - delta/8, 
    231309                         (ruler->upper - ruler->lower)/2.0, 2.0);     
    232310    g_signal_emit_by_name (ruler, "changed"); 
    233     break; 
    234   case 5: 
     311        return TRUE; 
     312           
     313  }  else if (event->direction == GDK_SCROLL_DOWN) {   /* mouse wheel scroll down */ 
     314         
    235315    delta = ruler->upper - ruler->lower; 
    236316    gtk_ruler_set_range (ruler, ruler->lower - delta/8, ruler->upper + delta/8, 
    237317                         (ruler->upper - ruler->lower)/2.0, 2.0);     
    238318    g_signal_emit_by_name (ruler, "changed"); 
    239     break; 
    240   default: 
    241     break; 
     319        return TRUE; 
    242320  } 
    243  
    244   return TRUE; 
    245 } 
    246  
    247 static gint 
    248 db_ruler_button_release (GtkWidget * widget, GdkEventButton * event) 
    249 { 
    250   DB_RULER(widget)->dragging = FALSE; 
    251  
    252   return TRUE; 
     321  return FALSE; /* redundant? */ 
    253322} 
    254323 

  • sweep/branches/sweep-jack-testing/src/file_mad.c

    r302 r355  
    7878  int fd; 
    7979 
    80 #define BUF_LEN 2048 
     80/* FIXME 
     81 * the mpeg frame marker can occur in non mpeg files so 
     82 * one blind check for a marker can produce a false postive. 
     83 * similarly, due to the metadata tags, the max 
     84 * frame size may also not be a large enough window within 
     85 * which to find a frame in a legal mpegfile.  
     86 * 
     87 * reimplement this check as a contextual verfification of  
     88 * a sequence of frames, starting from somewhere in the middle 
     89 * of a file. in the mean time, raise BUF_LEN from 2048 to 8192 
     90 * to mitigate the chance of a false negative. (with an increased  
     91 * change of a false positive as a result.) 
     92 */ 
     93#define BUF_LEN 8192  
    8194  unsigned char buf[BUF_LEN]; 
    8295  int n, i; 

  • sweep/branches/sweep-jack-testing/src/file_speex.c

    r281 r355  
    797797 
    798798  { 
     799    long bytes = op.bytes; 
    799800    op.packet = (unsigned char *) 
    800       speex_header_to_packet (&header, (int*)&(op.bytes)); 
     801      speex_header_to_packet (&header, &bytes); 
     802    op.bytes = bytes; 
    801803    op.b_o_s = 1; 
    802804    op.e_o_s = 0; 

  • sweep/branches/sweep-jack-testing/src/preferences.c

    r273 r355  
    239239  int nval, val; 
    240240  float fval; 
    241  
     241  union { int *ip; float *fp;} fp; 
    242242  if (prefs_tdb == NULL) return NULL; 
    243243 
    …… 
    254254  val = g_ntohl (nval); 
    255255 
    256   fval = *(float *)(&val); 
     256  fp.ip = &val; 
     257  fval = *fp.fp; 
    257258 
    258259#ifdef DEBUG 
    …… 
    270271  TDB_DATA key_data, val_data; 
    271272  int nval, ival; 
     273  union { int *ip; float *fp;} fp; 
    272274 
    273275  if (prefs_tdb == NULL) return -1; 
    …… 
    280282  key_data.dsize = strlen (key); 
    281283 
    282   ival = *(int *)(&val); 
     284  fp.fp = &val; 
     285  ival = *fp.ip; 
    283286  nval = g_htonl (ival); 
    284287 

  • sweep/branches/sweep-jack-testing/src/sample-display.c

    r289 r355  
    228228static guint sample_display_signals[LAST_SIGNAL] = { 0 }; 
    229229 
    230 static gchar sel_dash_list[2] = { 4, 4 }; /* Equivalent to GDK's default 
     230static gint8 sel_dash_list[2] = { 4, 4 }; /* Equivalent to GDK's default 
    231231                                          *  dash list. 
    232232                                          */ 

  • sweep/branches/sweep-jack-testing/sweep.desktop

    r124 r355  
    11[Desktop Entry] 
    22Name=Sweep 
    3 Comment=Sound Editor 
    4 Encoding=Legacy-Mixed 
     3GenericName=Sound Editor 
     4Comment=Sweep Sound Editor 
     5Categories=Application;AudioVideo; 
     6Encoding=UTF-8 
    57Exec=sweep 
    6 Icon=sweep.png 
     8Icon=sweep.svg 
    79MimeType=audio/x-wav 
    8 Terminal=0 
     10Terminal=false 
    911Type=Application