• R/O
  • HTTP
  • SSH
  • HTTPS

playumidi: コミット

playmidiのソースコードなど公開物一式のりぽじとり


コミットメタ情報

リビジョン95a6935a44163118dd338c3e18779b3d9db64be8 (tree)
日時2020-08-23 13:41:22
作者Koine Yuusuke(koinec) <koinec@user...>
コミッターKoine Yuusuke(koinec)

ログメッセージ

Fixed a problem that guw_division global variable was mistakenly defined in two sources (0.8.2->0.8.3)

変更サマリ

差分

--- a/README
+++ b/README
@@ -1,5 +1,5 @@
11 playumidi - play standard midi-file format 0/1 for FreeBSD USB-MIDI device
2- Version 0.8.2
2+ Version 0.8.3
33
44
55 [Introduction]--------------------------------------------------------------
@@ -164,6 +164,9 @@ playumidi - play standard midi-file format 0/1 for FreeBSD USB-MIDI device
164164
165165 [CHANGELOG]--------------------------------------------------------------
166166
167+ Version 0.8.3 - 2020/08/23
168+ * Since a global variable with the same name was defined in midievent.c
169+ and play_event.c, a fix for a build error occurred.
167170 Version 0.8.2 - 2019/08/11
168171 * Minor Correction for support FreeBSD ports. (Makefile)
169172 Version 0.8.1 - 2015/12/23
--- a/README.jp
+++ b/README.jp
@@ -165,6 +165,9 @@ playumidi - play standard midi-file format 0/1 for FreeBSD USB-MIDI device
165165
166166 [変更履歴]---------------------------------------------------------------
167167
168+ Version 0.8.3 - 2020/08/23
169+ * midievent.c および play_event.cで誤って同一のグローバル変数を定義
170+ していたバグを修正。
168171 Version 0.8.2 - 2019/08/11
169172 * ports作成に伴うMakefile修正
170173 Version 0.8.1 - 2015/12/23
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
33 # P L A Y U M I D I
44 # (/dev/umixiX.Y Direct MIDI Player)
55 #
6-# Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+# Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77 #
88 # Redistribution and use in source and binary forms, with or without
99 # modification, are permitted provided that the following conditions are met:
--- a/src/config.h
+++ b/src/config.h
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/micro_sleep.c
+++ b/src/micro_sleep.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/midi_device.c
+++ b/src/midi_device.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/midievent.c
+++ b/src/midievent.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
@@ -39,7 +39,7 @@ MIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDI*/
3939 MidiEventInfo *gp_event = NULL;
4040 Byte *gpb_vardata = NULL;
4141
42-Word guw_division;
42+Word guw_midi_division;
4343 DWord gdw_max_events;
4444 DWord gdw_max_metasize;
4545
@@ -49,7 +49,7 @@ EXTERN_FUNC_MIDIEVENT int
4949 MidiEvent_GetMidiInfo(
5050 MidiInfo *p_midi ) {
5151
52- p_midi->uw_division = guw_division;
52+ p_midi->uw_division = guw_midi_division;
5353 p_midi->dw_max_events = gdw_max_events;
5454 p_midi->dw_max_metasize = gdw_max_metasize;
5555 p_midi->p_event = gp_event;
@@ -64,7 +64,7 @@ EXTERN_FUNC_MIDIEVENT void
6464 MidiEvent_SetMidiDivision(
6565 Word uw_division ) {
6666
67- guw_division = uw_division;
67+ guw_midi_division = uw_division;
6868
6969 return;
7070 }
--- a/src/play_event.c
+++ b/src/play_event.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/playumidi.h
+++ b/src/playumidi.h
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@ MIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDIMIDI*/
3535 #include"config.h"
3636 #include"smf.h"
3737
38-#define STRING_VERSION "Version 0.8.2 (2019/08/11)"
38+#define STRING_VERSION "Version 0.8.3 (2020/08/23)"
3939
4040
4141 typedef unsigned char Byte;
--- a/src/read_smf.c
+++ b/src/read_smf.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/smf.h
+++ b/src/smf.h
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
--- a/src/verify_event.c
+++ b/src/verify_event.c
@@ -3,7 +3,7 @@
33 P L A Y U M I D I
44 (/dev/umixiX.Y Direct MIDI Player)
55
6- Copyright(C) 2014-2019 Koine Yuusuke(koinec). All rights reserved.
6+ Copyright(C) 2014-2020 Koine Yuusuke(koinec). All rights reserved.
77
88 Redistribution and use in source and binary forms, with or without
99 modification, are permitted provided that the following conditions are met:
旧リポジトリブラウザで表示