From 972afcc638ae7710aad5ee13d9404b4c9677aa93 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 3 Mar 1997 13:09:34 +0100 Subject: [PATCH] partial: 0.0.38.jcn --- hdr/{lyricitem.hh => lyric-item.hh} | 2 +- hdr/{mididef.hh => midi-def.hh} | 2 +- hdr/{midiitem.hh => midi-item.hh} | 2 +- hdr/{midistream.hh => midi-stream.hh} | 2 +- hdr/{sourcefile.hh => source-file.hh} | 10 ++++------ src/{mididef.cc => midi-def.cc} | 4 ++-- src/{midiitem.cc => midi-item.cc} | 7 ++++--- src/{midistream.cc => midi-stream.cc} | 7 ++++--- 8 files changed, 18 insertions(+), 18 deletions(-) rename hdr/{lyricitem.hh => lyric-item.hh} (89%) rename hdr/{mididef.hh => midi-def.hh} (96%) rename hdr/{midiitem.hh => midi-item.hh} (97%) rename hdr/{midistream.hh => midi-stream.hh} (94%) rename hdr/{sourcefile.hh => source-file.hh} (76%) rename src/{mididef.cc => midi-def.cc} (94%) rename src/{midiitem.cc => midi-item.cc} (97%) rename src/{midistream.cc => midi-stream.cc} (94%) diff --git a/hdr/lyricitem.hh b/hdr/lyric-item.hh similarity index 89% rename from hdr/lyricitem.hh rename to hdr/lyric-item.hh index 46873d8f51..dfbaf988d1 100644 --- a/hdr/lyricitem.hh +++ b/hdr/lyric-item.hh @@ -1,5 +1,5 @@ // -// lyricitem.hh -- part of LilyPond +// lyric-item.hh -- part of LilyPond // // copyright 1997 Jan Nieuwenhuizen diff --git a/hdr/mididef.hh b/hdr/midi-def.hh similarity index 96% rename from hdr/mididef.hh rename to hdr/midi-def.hh index 9a24fa51ff..7a559adf58 100644 --- a/hdr/mididef.hh +++ b/hdr/midi-def.hh @@ -1,5 +1,5 @@ /* - mididef.hh -- declare + midi-def.hh -- declare source file of the LilyPond music typesetter diff --git a/hdr/midiitem.hh b/hdr/midi-item.hh similarity index 97% rename from hdr/midiitem.hh rename to hdr/midi-item.hh index f4b14aa5ef..6688e95411 100644 --- a/hdr/midiitem.hh +++ b/hdr/midi-item.hh @@ -1,5 +1,5 @@ // -// midiitem.hh -- part of LilyPond +// midi-item.hh -- part of LilyPond // // copyright 1997 Jan Nieuwenhuizen diff --git a/hdr/midistream.hh b/hdr/midi-stream.hh similarity index 94% rename from hdr/midistream.hh rename to hdr/midi-stream.hh index 769cd23250..6946bfdda1 100644 --- a/hdr/midistream.hh +++ b/hdr/midi-stream.hh @@ -1,5 +1,5 @@ // -// midistream.hh -- part of LilyPond +// midi-stream.hh -- part of LilyPond // // copyright 1997 Jan Nieuwenhuizen diff --git a/hdr/sourcefile.hh b/hdr/source-file.hh similarity index 76% rename from hdr/sourcefile.hh rename to hdr/source-file.hh index 251efd517e..7f7168eb7e 100644 --- a/hdr/sourcefile.hh +++ b/hdr/source-file.hh @@ -1,5 +1,5 @@ // -// sourcefile.hh -- declare Source_file +// source-file.hh -- declare Source_file // // copyright 1997 Jan Nieuwenhuizen @@ -10,11 +10,9 @@ class Source_file { public: - /** - @return path to opened file. - */ - // jcn: ugh! filename gets changed!, why? - Source_file( String& filename_str ); + /** Ugh! filename gets changed! The path to the opened file may + change, since it might be searched in multiple directories. */ + Source_file( String& filename_str_r ); virtual ~Source_file(); char const* ch_c_l(); diff --git a/src/mididef.cc b/src/midi-def.cc similarity index 94% rename from src/mididef.cc rename to src/midi-def.cc index 2c7bf7a7a7..5430823ed2 100644 --- a/src/mididef.cc +++ b/src/midi-def.cc @@ -1,5 +1,5 @@ // -// mididef.cc -- implement midi output +// midi-def.cc -- implement midi output // // source file of the LilyPond music typesetter // @@ -7,7 +7,7 @@ #include #include "misc.hh" -#include "mididef.hh" +#include "midi-def.hh" #include "debug.hh" // classes, alphasorted diff --git a/src/midiitem.cc b/src/midi-item.cc similarity index 97% rename from src/midiitem.cc rename to src/midi-item.cc index c57f9ff5de..9d121cfcd8 100644 --- a/src/midiitem.cc +++ b/src/midi-item.cc @@ -1,5 +1,5 @@ // -// midiitem.cc +// midi-item.cc // // source file of the LilyPond music typesetter // @@ -13,8 +13,9 @@ #include "request.hh" #include "musicalrequest.hh" #include "voice.hh" -#include "midiitem.hh" -#include "midistream.hh" +#include "midi-item.hh" +#include "midi-stream.hh" +#include "string-convert.hh" Midi_chunk::Midi_chunk() { diff --git a/src/midistream.cc b/src/midi-stream.cc similarity index 94% rename from src/midistream.cc rename to src/midi-stream.cc index f561e0b946..3630831ac6 100644 --- a/src/midistream.cc +++ b/src/midi-stream.cc @@ -1,5 +1,5 @@ // -// midistream.cc +// midi-stream.cc // // source file of the LilyPond music typesetter // @@ -9,9 +9,10 @@ #include #include "main.hh" #include "misc.hh" -#include "midiitem.hh" -#include "midistream.hh" +#include "midi-item.hh" +#include "midi-stream.hh" #include "debug.hh" +#include "string-convert.hh" Midi_stream::Midi_stream( String filename_str, int tracks_i, int clocks_per_4_i ) { -- 2.39.5