From: Han-Wen Nienhuys Date: Sun, 2 May 2004 21:22:22 +0000 (+0000) Subject: * lily/include/audio-column.hh: remove unused variables. X-Git-Tag: release/2.3.1~31 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f14b2141454dd5d1c557c95923c5a33a984a480;p=lilypond.git * lily/include/audio-column.hh: remove unused variables. (patch by Michael Welsh Duggan) * flower/include/axes.hh (other_axis): inline Axes function (thanks to David Brandon). --- diff --git a/ChangeLog b/ChangeLog index ff81165783..cb24329e76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-05-02 Han-Wen Nienhuys + + * lily/include/audio-column.hh: remove unused variables. + (patch by Michael Welsh Duggan) + + * flower/include/axes.hh (other_axis): inline Axes function + (thanks to David Brandon). + 2004-05-02 Jan Nieuwenhuizen * cygwin/mknetrel: Install image links (backportme). diff --git a/flower/axis.cc b/flower/axis.cc index 7b264c2da9..d28657aabe 100644 --- a/flower/axis.cc +++ b/flower/axis.cc @@ -16,30 +16,3 @@ axis_name_string (Axis a) return to_string (char (a + 'x')); } - -Axis -other_axis (Axis a) -{ - return a == Y_AXIS ? X_AXIS : Y_AXIS; -} - -/* - TODO inline these. - */ -Axis -post_incr (Axis &a) -{ - assert (a < NO_AXES); - Axis b= a; - a = Axis (int (a) + 1); - return b; -} - -Axis -incr (Axis &a) -{ - assert (a < NO_AXES); - a = Axis (int (a) + 1); - return a; -} - diff --git a/flower/include/axes.hh b/flower/include/axes.hh index b01ef9915f..d2d57e0fbf 100644 --- a/flower/include/axes.hh +++ b/flower/include/axes.hh @@ -10,26 +10,28 @@ #ifndef AXES_HH #define AXES_HH +#include + enum Axis { X_AXIS =0, Y_AXIS =1, NO_AXES=2, }; - -class String; - -String axis_name_string (Axis); - - -/** - the operator ++ for Axis. - */ -Axis other_axis (Axis); -Axis post_incr (Axis &); -Axis incr (Axis &); -//Axis operator++ (Axis); - - +static inline +Axis +incr (Axis &a) +{ + assert (a < NO_AXES); + a = Axis (int (a) + 1); + return a; +} + +static inline +Axis +other_axis (Axis a) +{ + return a == Y_AXIS ? X_AXIS : Y_AXIS; +} #endif // AXES_HH diff --git a/flower/include/offset.hh b/flower/include/offset.hh index b7fea1313a..3622c7be41 100644 --- a/flower/include/offset.hh +++ b/flower/include/offset.hh @@ -11,6 +11,7 @@ #include "real.hh" #include "axes.hh" #include "arithmetic-operator.hh" +#include "string.hh" Offset complex_multiply (Offset, Offset); Offset complex_divide (Offset, Offset); diff --git a/lily/audio-column.cc b/lily/audio-column.cc index 5bec2f0dbf..549f0f153d 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -13,7 +13,6 @@ Audio_column::Audio_column (Moment at_mom) { at_mom_ = at_mom; - performance_ = 0; } void diff --git a/lily/box.cc b/lily/box.cc index 5ec4a9f039..97bbbb905b 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -8,6 +8,7 @@ #include "box.hh" #include "array.hh" +#include "axes.hh" void Box::translate (Offset o) diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 05fe7e161b..457629455f 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -10,7 +10,6 @@ #ifndef ALIGN_INTERFACE_HH #define ALIGN_INTERFACE_HH -#include "axes.hh" #include "lily-proto.hh" #include "lily-guile.hh" diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index 18f51d5bfb..9b78075c6e 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -23,10 +23,8 @@ public: void add_audio_item (Audio_item* i); Moment at_mom () const; - void print () const; Link_array audio_items_; - Performance * performance_; private: Audio_column (Audio_column const&); diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index 8ab5d48fc3..b4ded08818 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -11,7 +11,6 @@ #include "real.hh" #include "drul-array.hh" #include "interval.hh" -#include "axes.hh" #include "offset.hh" #include "array.hh" #include "polynomial.hh" diff --git a/lily/include/box.hh b/lily/include/box.hh index 252b695e7b..a04661fa56 100644 --- a/lily/include/box.hh +++ b/lily/include/box.hh @@ -9,8 +9,6 @@ #include "real.hh" #include "interval.hh" #include "offset.hh" -#include "axes.hh" - struct Box { diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh index 5168dca5ef..58d8e566ed 100644 --- a/lily/include/stencil.hh +++ b/lily/include/stencil.hh @@ -11,7 +11,6 @@ #include // size_t #include "lily-proto.hh" #include "box.hh" -#include "axes.hh" #include "direction.hh" #include "lily-guile.hh" #include "smobs.hh" diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 0c791e51ec..e4ae2fb343 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -41,7 +41,6 @@ public: Translator (Translator const &); - void removal_processing (); SCM internal_get_property (SCM symbol) const; virtual Music_output_def *get_output_def () const; diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/score.cc b/lily/score.cc index e52c8b5815..c5c284b1f1 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -189,18 +189,21 @@ Score::book_rendering (String outname, Music_output_def *default_def, for (int i = 0; !i || i < outdef_count; i++) { Music_output_def *def = outdef_count ? defs_[i] : default_def; - SCM context = ly_run_translator (music_, def->self_scm ()); - if (Global_context *g = dynamic_cast - (unsmob_context (context))) + if (!(no_paper_global_b && dynamic_cast (def))) { - SCM s = ly_format_output (context, out); - if (s != SCM_UNDEFINED) + SCM context = ly_run_translator (music_, def->self_scm ()); + if (Global_context *g = dynamic_cast + (unsmob_context (context))) { - systems = s; - /* Ugh. */ - Music_output *output = g->get_output (); - if (Paper_score *ps = dynamic_cast (output)) - *paper = ps->paper_; + SCM s = ly_format_output (context, out); + if (s != SCM_UNDEFINED) + { + systems = s; + /* Ugh. */ + Music_output *output = g->get_output (); + if (Paper_score *ps = dynamic_cast (output)) + *paper = ps->paper_; + } } } }