mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

57 lines
2.0 KiB

  1. --- ./src/core/export_project_dialog.cpp.orig 2006-03-16 12:14:02.000000000 +0100
  2. +++ ./src/core/export_project_dialog.cpp 2006-03-16 12:14:30.000000000 +0100
  3. @@ -46,6 +46,7 @@
  4. #endif
  5. +#include <stdlib.h>
  6. #include "export_project_dialog.h"
  7. #include "song_editor.h"
  8. diff -dur lmms-0.1.4/src/core/piano_roll.cpp build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/core/piano_roll.cpp
  9. --- lmms-0.1.4/src/core/piano_roll.cpp 2006-01-22 13:35:35.000000000 +0100
  10. +++ build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/core/piano_roll.cpp 2006-03-29 22:48:41.000000000 +0200
  11. @@ -23,7 +23,6 @@
  12. *
  13. */
  14. -
  15. #include "qt3support.h"
  16. #ifdef QT4
  17. @@ -70,6 +69,10 @@
  18. #include "text_float.h"
  19. #include "combobox.h"
  20. +#ifdef LMMS_DEBUG
  21. +#include <assert.h>
  22. +#endif
  23. +
  24. extern tones whiteKeys[]; // defined in piano_widget.cpp
  25. diff -dur lmms-0.1.4/src/lib/ladspa_manager.cpp build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/lib/ladspa_manager.cpp
  26. --- lmms-0.1.4/src/lib/ladspa_manager.cpp 2005-12-19 13:17:23.000000000 +0100
  27. +++ build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/lib/ladspa_manager.cpp 2006-03-29 22:52:16.000000000 +0200
  28. @@ -46,6 +46,7 @@
  29. #endif
  30. +#include <stdlib.h>
  31. #include <math.h>
  32. diff -dur lmms-0.1.4/src/midi/midi_file.cpp build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/midi/midi_file.cpp
  33. --- lmms-0.1.4/src/midi/midi_file.cpp 2005-12-15 11:04:24.000000000 +0100
  34. +++ build/generic-distro-TRUNK-x86-athlon-xp-32-generic-expert/ROCK/src.lmms.1143553855.6854.3820088609/lmms-0.1.4/src/midi/midi_file.cpp 2006-03-29 22:53:20.000000000 +0200
  35. @@ -44,6 +44,10 @@
  36. #include <qapplication.h>
  37. #include <qprogressdialog.h>
  38. +#ifdef LMMS_DEBUG
  39. +#include <assert.h>
  40. +#endif
  41. +
  42. #define ungetChar ungetch
  43. #define seek at
  44. #define pos at