Skip to content

Commit 4ec67b5

Browse files
ElecGeekElecGeek
committed
Cleanup, no new features nor fixes.
The params_code file has been deleted as * the documentation has its own (non compilable) file. * the mnemo and midi event structures has been merged into their own files. The status has now its own file, as it is a common object to all the input methods Some include files in the params_output_xxx was irrelevant.
1 parent b20cc8a commit 4ec67b5

10 files changed

Lines changed: 63 additions & 65 deletions

‎cpp_version/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
CXX?=g++
2-
CXXFLAGS?=-O2 -m64
3-
LDFLAGS?=-m64
1+
CXX=g++
2+
CXXFLAGS?=-O2
3+
LDFLAGS?=
44
DEFAULTWAVE?=SINE
55
WITH_JACKAUDIO?=YES
66
CXX_Version?=-std=c++17
@@ -66,16 +66,16 @@ $(BUILDDIR)params_io_handler.o : $(SRCDIR)params_io_handler.hxx $(SRCDIR)param
6666
$(BUILDDIR)parameters.o : $(SRCDIR)parameters.hxx $(SRCDIR)parameters.cpp $(SRCDIR)amplitude_handler.hxx
6767
$(CXX) -c $(CXXFLAGS) $(CXX_Version) -o $(BUILDDIR)parameters.o $(SRCDIR)parameters.cpp
6868

69-
$(BUILDDIR)params_input_midi.o : $(SRCDIR)params_input_midi.hxx $(SRCDIR)params_input_midi.cpp $(SRCDIR)parameters.hxx $(SRCDIR)params_codes.hxx
69+
$(BUILDDIR)params_input_midi.o : $(SRCDIR)params_input_midi.hxx $(SRCDIR)params_input_midi.cpp $(SRCDIR)parameters.hxx
7070
$(CXX) -c $(CXXFLAGS) $(CXX_Version) -o $(BUILDDIR)params_input_midi.o $(SRCDIR)params_input_midi.cpp
7171

72-
$(BUILDDIR)params_input_mnemos.o : $(SRCDIR)params_input_mnemos.hxx $(SRCDIR)params_input_mnemos.cpp $(SRCDIR)parameters.hxx $(SRCDIR)params_codes.hxx
72+
$(BUILDDIR)params_input_mnemos.o : $(SRCDIR)params_input_mnemos.hxx $(SRCDIR)params_input_mnemos.cpp $(SRCDIR)parameters.hxx
7373
$(CXX) -c $(CXXFLAGS) $(CXX_Version) -o $(BUILDDIR)params_input_mnemos.o $(SRCDIR)params_input_mnemos.cpp
7474

75-
$(BUILDDIR)params_output_txt.o : $(SRCDIR)params_output_txt.hxx $(SRCDIR)params_output_txt.cpp $(SRCDIR)parameters.hxx $(SRCDIR)params_codes.hxx
75+
$(BUILDDIR)params_output_txt.o : $(SRCDIR)params_output_txt.hxx $(SRCDIR)params_output_txt.cpp $(SRCDIR)parameters.hxx
7676
$(CXX) -c $(CXXFLAGS) $(CXX_Version) -o $(BUILDDIR)params_output_txt.o $(SRCDIR)params_output_txt.cpp
7777

78-
$(BUILDDIR)params_output_mnemos.o : $(SRCDIR)params_output_mnemos.hxx $(SRCDIR)params_output_mnemos.cpp $(SRCDIR)parameters.hxx $(SRCDIR)params_codes.hxx
78+
$(BUILDDIR)params_output_mnemos.o : $(SRCDIR)params_output_mnemos.hxx $(SRCDIR)params_output_mnemos.cpp $(SRCDIR)parameters.hxx
7979
$(CXX) -c $(CXXFLAGS) $(CXX_Version) -o $(BUILDDIR)params_output_mnemos.o $(SRCDIR)params_output_mnemos.cpp
8080

8181
.PHONY : $(BUILDDIR)sound_jack_output.o $(BUILDDIR)main.o

‎cpp_version/parameters.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "parameters.hxx"
22

3+
input_event::input_event():
4+
status(warming_up)
5+
{}
6+
37
signals_param_action::signals_param_action( const unsigned short&channel_id,
48
const action_list&action,
59
const unsigned short&value):

‎cpp_version/parameters.hxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ struct signals_param_action
3636
signals_param_action( const unsigned short&,const action_list&,const unsigned short&);
3737
friend ostream&operator<<(ostream&,const signals_param_action&);
3838
};
39+
struct input_event {
40+
input_event();
41+
enum status_t{ warming_up, running, end_track } status;
42+
};
3943
class params_base
4044
{
4145
public:

‎cpp_version/params_codes.hxx‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎cpp_version/params_input_midi.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#include "params_input_midi.hxx"
22

33
midi_event::midi_event():
4-
code( 0 ), key( 0 ), value( 0 ),
5-
status( warming_up )
4+
code( 0 ), key( 0 ), value( 0 )
65
{}
76

87
midi_bytes_stream::midi_bytes_stream(ostream&os,const bool&with_time_stamp, input_params_base::clearing_t&clearing ):
@@ -131,7 +130,7 @@ ostream& operator<<( ostream&the_out , const midi_bytes_stream&me )
131130
input_params_midi_2_action::input_params_midi_2_action(ostream&info_out_str,
132131
const midi_event&the_event,
133132
input_params_base::clearing_t&clearing,
134-
midi_event::status_t&status):
133+
input_event::status_t&status):
135134
info_out_str( info_out_str ),
136135
the_event( the_event ),
137136
ipm2a_clearing( clearing ),
@@ -208,7 +207,7 @@ void input_params_midi_2_action::midi_2_action_run(vector<signals_param_action>&
208207
break;
209208
case 0x02:
210209
// Abort
211-
ipm2a_status = midi_event::end_track;
210+
ipm2a_status = input_event::end_track;
212211
ipm2a_clearing = input_params_base::c_abort;
213212
break;
214213
case 0x04:

‎cpp_version/params_input_midi.hxx‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,16 @@ using namespace std;
1212
#define __PARAMS_INPUT_MIDI__
1313

1414
#include "parameters.hxx"
15-
#include "params_codes.hxx"
15+
16+
17+
/** \brief Internal data specific to the midi events
18+
*/
19+
struct midi_event {
20+
unsigned char code;
21+
unsigned char key;
22+
unsigned char value;
23+
midi_event();
24+
};
1625

1726
/** \brief Handles midio bytes datagram
1827
*
@@ -21,15 +30,15 @@ using namespace std;
2130
* and populates the midi event data ( time-stamp (if so ), code, key, value )\n
2231
* This event is empty because jackaudio has not yet been written
2332
*/
24-
class midi_bytes_datagram : public midi_event {
33+
class midi_bytes_datagram : public midi_event, public input_event {
2534

2635
};
2736
/** \brief Handles midi byte stream
2837
*
2938
* Reads bytes coming from a file, serial port etc...
3039
* and populates the midi event data ( time-stamp (if so ), code, key, value )
3140
*/
32-
class midi_bytes_stream : public midi_event {
41+
class midi_bytes_stream : public midi_event, public input_event {
3342
enum state_t{ state_ts, state_code, state_key, state_val, state_string, state_end } state;
3443
ostream&info_out_str;
3544
// The input iterator should come here
@@ -70,13 +79,13 @@ class input_params_midi_2_action
7079
unsigned long get_value( const unsigned char&exponent_size, const unsigned char&exponent_const )const;
7180
const midi_event&the_event;
7281
input_params_base::clearing_t&ipm2a_clearing;
73-
midi_event::status_t&ipm2a_status;
82+
input_event::status_t&ipm2a_status;
7483
public:
7584
input_params_midi_2_action(void)=delete;
7685
input_params_midi_2_action( ostream&info_out_str,
7786
const midi_event&,
7887
input_params_base::clearing_t&clearing,
79-
midi_event::status_t&status);
88+
input_event::status_t&status);
8089
void midi_2_action_run(vector<signals_param_action>&actions_list);
8190
};
8291
/** \brief Bundle class byte stream

‎cpp_version/params_input_mnemos.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#include "params_input_mnemos.hxx"
22
#include <cmath>
33

4-
mnemo_event::mnemo_event():
5-
status( warming_up )
4+
mnemo_event::mnemo_event()
65
{
76
TS_left.reserve(15);
87
TS_right.reserve(15);
@@ -733,7 +732,7 @@ string input_params_mnemos_2_action::Angle_strings_2_val(unsigned long&val_0_15)
733732
input_params_mnemos_2_action::input_params_mnemos_2_action( ostream&out_info_str,
734733
const mnemo_event&the_event,
735734
input_params_base::clearing_t&clearing,
736-
mnemo_event::status_t&status):
735+
input_event::status_t&status):
737736
info_out_str(info_out_str),
738737
the_event( the_event ),
739738
ipm2a_clearing( clearing ),
@@ -861,7 +860,7 @@ void input_params_mnemos_2_action::mnemos_2_action_run(vector<signals_param_acti
861860
switch( mnemos_list_iter->first )
862861
{
863862
case P_abort:
864-
ipm2a_status = mnemo_event::end_track;
863+
ipm2a_status = input_event::end_track;
865864
ipm2a_clearing = input_params_base::c_abort;
866865
break;
867866
}

‎cpp_version/params_input_mnemos.hxx‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,32 @@ using namespace std;
1212
#define __PARAMS_INPUT_MNEMOS__
1313

1414
#include "parameters.hxx"
15-
#include "params_codes.hxx"
1615

1716

18-
class mnemos_bytes_stream : public mnemo_event {
17+
// Keep left and right in order to allow comma or point as a decimal separator
18+
// and even a mix inside the same file
19+
// The restriction is 3 digits blocs are not allowed e.g. 123,456.5
20+
/** \brief Internal data specific to the mnemo events
21+
*/
22+
struct mnemo_event {
23+
string TS_left;
24+
string TS_right;
25+
string TS_unit;
26+
string channel;
27+
string mnemo;
28+
string value_left;
29+
string value_right;
30+
string value_unit;
31+
mnemo_event();
32+
mnemo_event( const string&, const string&, const string&,
33+
const string&channel,
34+
const string&mnemo,
35+
const string&, const string&, const string& );
36+
};
37+
38+
class mnemos_bytes_stream : public mnemo_event, public input_event {
1939
// just copied and pasted, have to be enriched by the line parsing
20-
enum state_t{ state_ts, state_code, state_key, state_val, state_string, state_end } state;
40+
enum state_t{ state_ts, state_code, state_end } state;
2141
enum{ ls_start=0, ls_wait_eol_comment=1,
2242
ls_in_ts_left=2, ls_in_ts_right=3, ls_in_ts_unit=4, ls_spctab_ts=5,
2343
ls_in_channel=6, ls_spctab_channel=7,
@@ -44,7 +64,7 @@ public:
4464
// For debug purposes, sends the content of a mnemo message
4565
friend ostream&operator<<( ostream&, const mnemos_bytes_stream& );
4666
};
47-
class mnemos_bytes_datagram_test : public mnemo_event {
67+
class mnemos_bytes_datagram_test : public mnemo_event, public input_event {
4868
ostream&info_out_str;
4969
input_params_base::clearing_t&mbs_clearing;
5070
public:
@@ -122,7 +142,7 @@ private:
122142
unsigned long get_value( const unsigned char&exponent_size, const unsigned char&exponent_const )const;
123143
const mnemo_event&the_event;
124144
input_params_base::clearing_t&ipm2a_clearing;
125-
mnemo_event::status_t&ipm2a_status;
145+
input_event::status_t&ipm2a_status;
126146
const multimap< short, string >mnemos_list;
127147
// Not that readable, but it avoid excessive indentation in the constructor
128148
const map< string, function< string(unsigned long&,signals_param_action::action_list&)> >mrf;
@@ -138,7 +158,7 @@ public:
138158
input_params_mnemos_2_action(ostream&info_out_str,
139159
const mnemo_event&,
140160
input_params_base::clearing_t&clearing,
141-
mnemo_event::status_t&status);
161+
input_event::status_t&status);
142162
void mnemos_2_action_run(vector<signals_param_action>&actions_list);
143163
};
144164

‎cpp_version/params_output_mnemos.hxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ using namespace std;
1414
#ifndef __PARAMS_OUTPUT_MNEMOS__
1515
#define __PARAMS_OUTPUT_MNEMOS__
1616

17-
#include "params_codes.hxx"
1817
#include "parameters.hxx"
1918

20-
class output_params_mnemos : public output_params_base, private midi_event
19+
class output_params_mnemos : public output_params_base
2120
{
2221
void cnv_2_note_velocity( const unsigned char&nbre_bits_expo,const unsigned short&value,
2322
unsigned char&note, unsigned char&velocity);

‎cpp_version/params_output_txt.hxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ using namespace std;
1414
#ifndef __PARAMS_OUTPUT_TXT__
1515
#define __PARAMS_OUTPUT_TXT__
1616

17-
#include "params_codes.hxx"
1817
#include "parameters.hxx"
1918

20-
class output_params_txt : public output_params_base, private mnemo_event
19+
class output_params_txt : public output_params_base
2120
{
2221
void cnv_2_note_velocity( const unsigned char&nbre_bits_expo,const unsigned short&value,
2322
unsigned char&note, unsigned char&velocity);

0 commit comments

Comments
 (0)