[Scummvm-cvs-logs] SF.net SVN: scummvm:[46413] scummvm/trunk/engines/sci/sfx
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Dec 18 18:48:46 CET 2009
Revision: 46413
http://scummvm.svn.sourceforge.net/scummvm/?rev=46413&view=rev
Author: thebluegr
Date: 2009-12-18 17:48:45 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
Moved the midi_writer struct into the place where it's actually used, and named the header file appropriately
Modified Paths:
--------------
scummvm/trunk/engines/sci/sfx/seq/gm.cpp
scummvm/trunk/engines/sci/sfx/seq/instrument-map.h
Added Paths:
-----------
scummvm/trunk/engines/sci/sfx/seq/midiwriter.h
Removed Paths:
-------------
scummvm/trunk/engines/sci/sfx/device.h
Deleted: scummvm/trunk/engines/sci/sfx/device.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/device.h 2009-12-17 23:07:03 UTC (rev 46412)
+++ scummvm/trunk/engines/sci/sfx/device.h 2009-12-18 17:48:45 UTC (rev 46413)
@@ -1,88 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-/* song player structure */
-
-#ifndef SCI_SFX_DEVICE_H
-#define SCI_SFX_DEVICE_H
-
-#include "common/scummsys.h"
-#include "common/error.h"
-
-namespace Sci {
-
-struct midi_writer_t {
- char *name; /* Name description of the device */
-
- Common::Error (*init)(midi_writer_t *self);
- /* Initializes the writer
- ** Parameters: (midi_writer_t *) self: Self reference
- ** Returns : (int) Common::kNoError on success, Common::kUnknownError if the device could not be
- ** opened
- */
-
- Common::Error (*set_option)(midi_writer_t *self, char *name, char *value);
- /* Sets an option for the writer
- ** Parameters: (char *) name: Name of the option to set
- ** (char *) value: Value of the option to set
- ** Returns : (int) Common::kNoError on success, Common::kUnknownError otherwise (unsupported option)
- */
-
- Common::Error (*write)(midi_writer_t *self, unsigned char *buf, int len);
- /* Writes some bytes to the MIDI stream
- ** Parameters: (char *) buf: The buffer to write
- ** (int) len: Number of bytes to write
- ** Returns : (int) Common::kNoError on success, Common::kUnknownError on failure
- ** No delta time is expected here.
- */
-
- void (*delay)(midi_writer_t *self, int ticks);
- /* Introduces an explicit delay
- ** Parameters: (int) ticks: Number of 60 Hz ticks to sleep
- */
-
- void (*flush)(midi_writer_t *self); /* May be NULL */
- /* Flushes the MIDI file descriptor
- ** Parameters: (midi_writer_t *) self: Self reference
- */
-
- void (*reset_timer)(midi_writer_t *self);
- /* Resets the timer associated with this device
- ** Parameters: (midi_writer_t *) self: Self reference
- ** This function makes sure that a subsequent write would have effect
- ** immediately, and any delay() would be relative to the point in time
- ** this function was invoked at.
- */
-
- void (*close)(midi_writer_t *self);
- /* Closes the associated MIDI device
- ** Parameters: (midi_writer_t *) self: Self reference
- */
-};
-
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_DEVICE_H
Modified: scummvm/trunk/engines/sci/sfx/seq/gm.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/gm.cpp 2009-12-17 23:07:03 UTC (rev 46412)
+++ scummvm/trunk/engines/sci/sfx/seq/gm.cpp 2009-12-18 17:48:45 UTC (rev 46413)
@@ -25,7 +25,7 @@
#include "common/util.h"
-#include "sci/sfx/device.h"
+#include "sci/sfx/seq/midiwriter.h"
#include "sci/sfx/seq/instrument-map.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/seq/instrument-map.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/instrument-map.h 2009-12-17 23:07:03 UTC (rev 46412)
+++ scummvm/trunk/engines/sci/sfx/seq/instrument-map.h 2009-12-18 17:48:45 UTC (rev 46413)
@@ -28,7 +28,7 @@
#ifndef SCI_SFX_SEQ_INSTRUMENT_MAP_H
#define SCI_SFX_SEQ_INSTRUMENT_MAP_H
-#include "sci/sfx/device.h"
+#include "sci/sfx/seq/midiwriter.h"
namespace Sci {
Copied: scummvm/trunk/engines/sci/sfx/seq/midiwriter.h (from rev 46270, scummvm/trunk/engines/sci/sfx/device.h)
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/midiwriter.h (rev 0)
+++ scummvm/trunk/engines/sci/sfx/seq/midiwriter.h 2009-12-18 17:48:45 UTC (rev 46413)
@@ -0,0 +1,88 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/* song player structure */
+
+#ifndef SCI_SFX_SEQ_MIDIWRITER_H
+#define SCI_SFX_SEQ_MIDIWRITER_H
+
+#include "common/scummsys.h"
+#include "common/error.h"
+
+namespace Sci {
+
+struct midi_writer_t {
+ char *name; /* Name description of the device */
+
+ Common::Error (*init)(midi_writer_t *self);
+ /* Initializes the writer
+ ** Parameters: (midi_writer_t *) self: Self reference
+ ** Returns : (int) Common::kNoError on success, Common::kUnknownError if the device could not be
+ ** opened
+ */
+
+ Common::Error (*set_option)(midi_writer_t *self, char *name, char *value);
+ /* Sets an option for the writer
+ ** Parameters: (char *) name: Name of the option to set
+ ** (char *) value: Value of the option to set
+ ** Returns : (int) Common::kNoError on success, Common::kUnknownError otherwise (unsupported option)
+ */
+
+ Common::Error (*write)(midi_writer_t *self, unsigned char *buf, int len);
+ /* Writes some bytes to the MIDI stream
+ ** Parameters: (char *) buf: The buffer to write
+ ** (int) len: Number of bytes to write
+ ** Returns : (int) Common::kNoError on success, Common::kUnknownError on failure
+ ** No delta time is expected here.
+ */
+
+ void (*delay)(midi_writer_t *self, int ticks);
+ /* Introduces an explicit delay
+ ** Parameters: (int) ticks: Number of 60 Hz ticks to sleep
+ */
+
+ void (*flush)(midi_writer_t *self); /* May be NULL */
+ /* Flushes the MIDI file descriptor
+ ** Parameters: (midi_writer_t *) self: Self reference
+ */
+
+ void (*reset_timer)(midi_writer_t *self);
+ /* Resets the timer associated with this device
+ ** Parameters: (midi_writer_t *) self: Self reference
+ ** This function makes sure that a subsequent write would have effect
+ ** immediately, and any delay() would be relative to the point in time
+ ** this function was invoked at.
+ */
+
+ void (*close)(midi_writer_t *self);
+ /* Closes the associated MIDI device
+ ** Parameters: (midi_writer_t *) self: Self reference
+ */
+};
+
+
+} // End of namespace Sci
+
+#endif // SCI_SFX_SEQ_MIDIWRITER_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list