openmsx-commits — openMSX CVS commit mail

You can subscribe to this list here.

2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 Jan Feb Mar Apr May Jun Jul Aug Sep Oct (6) Nov (80) Dec (239) Jan (168) Feb (177) Mar (233) Apr (172) May (74) Jun (107) Jul (77) Aug (133) Sep (85) Oct (108) Nov (87) Dec (96) Jan (218) Feb (134) Mar (273) Apr (127) May (304) Jun (498) Jul (231) Aug (301) Sep (181) Oct (258) Nov (229) Dec (207) Jan (169) Feb (181) Mar (255) Apr (468) May (467) Jun (241) Jul (146) Aug (157) Sep (260) Oct (656) Nov (148) Dec (199) Jan (257) Feb (250) Mar (206) Apr (102) May (215) Jun (251) Jul (104) Aug (116) Sep (176) Oct (154) Nov (281) Dec (212) Jan (255) Feb (157) Mar (145) Apr (179) May (170) Jun (96) Jul (153) Aug (106) Sep (222) Oct (94) Nov (88) Dec (66) Jan (59) Feb (105) Mar (114) Apr (193) May (145) Jun (120) Jul (79) Aug (114) Sep (234) Oct (105) Nov (113) Dec (163) Jan (96) Feb (35) Mar (105) Apr (64) May (85) Jun (92) Jul (139) Aug (81) Sep (84) Oct (55) Nov (45) Dec (56) Jan (110) Feb (184) Mar (150) Apr (235) May (267) Jun (169) Jul (180) Aug (141) Sep (191) Oct (103) Nov (118) Dec (225) Jan (149) Feb (90) Mar (62) Apr (46) May (30) Jun (110) Jul (48) Aug (45) Sep (37) Oct (36) Nov (48) Dec (81) Jan (75) Feb (39) Mar (105) Apr (67) May (31) Jun (19) Jul (16) Aug (43) Sep (36) Oct (15) Nov (9) Dec (24) Jan (52) Feb (34) Mar (34) Apr (35) May (81) Jun (114) Jul (77) Aug (68) Sep (57) Oct (30) Nov (75) Dec (116) Jan (30) Feb (42) Mar (30) Apr (45) May (49) Jun (29) Jul (63) Aug (62) Sep (21) Oct (21) Nov (58) Dec (32) Jan (86) Feb (48) Mar (21) Apr (20) May (68) Jun (42) Jul (33) Aug (28) Sep (33) Oct (23) Nov (43) Dec (11) Jan (13) Feb (13) Mar (13) Apr (12) May (50) Jun (10) Jul Aug Sep Oct Nov Dec
S M T W T F S

1

2

3

4

5

6

7

8

9

10

11
(2)
12
(2)
13
(1)
14
(1)
15

16

17

18

19

20
(2)
21
(2)
22
(5)
23

24

25

26

27

28
(4)
29

30

Showing 19 results of 19

 [openMSX-commits] SF.net SVN: openmsx:[12197] openmsx/trunk/src/memory/RomBlocks.hh From: - 2011-06-28 20:14:34 Revision: 12197 http://openmsx.svn.sourceforge.net/openmsx/?rev=12197&view=rev Author: manuelbi Date: 2011-06-28 20:14:28 +0000 (Tue, 28 Jun 2011) Log Message: ----------- Fix Doxygen warning (error in Doxygen comments). Modified Paths: -------------- openmsx/trunk/src/memory/RomBlocks.hh Modified: openmsx/trunk/src/memory/RomBlocks.hh =================================================================== --- openmsx/trunk/src/memory/RomBlocks.hh 2011-06-28 20:11:40 UTC (rev 12196) +++ openmsx/trunk/src/memory/RomBlocks.hh 2011-06-28 20:14:28 UTC (rev 12197) @@ -28,7 +28,7 @@ * @param motherBoard * @param config * @param rom - * @debugBankSizeShift Sometimes the mapper is implemented with a + * @param debugBankSizeShift Sometimes the mapper is implemented with a * smaller block size than the blocks that get logically switched. * For example RomGameMaster2 is implemented as a 4kB mapper but * blocks get switched in 8kB chunks (done like this because there This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
 [openMSX-commits] SF.net SVN: openmsx:[12196] openmsx/trunk/src/Doxyfile From: - 2011-06-28 20:11:49 Revision: 12196 http://openmsx.svn.sourceforge.net/openmsx/?rev=12196&view=rev Author: manuelbi Date: 2011-06-28 20:11:40 +0000 (Tue, 28 Jun 2011) Log Message: ----------- Update Doxyfile to latest version. Modified Paths: -------------- openmsx/trunk/src/Doxyfile Modified: openmsx/trunk/src/Doxyfile =================================================================== --- openmsx/trunk/src/Doxyfile 2011-06-28 18:34:08 UTC (rev 12195) +++ openmsx/trunk/src/Doxyfile 2011-06-28 20:11:40 UTC (rev 12196) @@ -1,289 +1,310 @@ -# Doxyfile 1.5.8 +# Doxyfile 1.7.4 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] # For lists items can also be appended using: # TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# Values that contain spaces should be placed between quotes (" "). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See # http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = openMSX -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = doxy -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, -# Spanish, Swedish, and Ukrainian. +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The$name class" "The $name widget" -# "The$name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The$name class" "The $name widget" +# "The$name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified # scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for # Fortran. OPTIMIZE_FOR_FORTRAN = NO -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for # VHDL. OPTIMIZE_OUTPUT_VHDL = NO -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. -EXTENSION_MAPPING = +EXTENSION_MAPPING = -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = YES -# If you use Microsoft's C++/CLI language, you should set this option to YES to +# If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public # instead of private inheritance when no explicit protection keyword is present. SIP_SUPPORT = NO -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the # methods anyway, you should set this option to NO. IDL_PROPERTY_SUPPORT = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols SYMBOL_CACHE_SIZE = 0 @@ -292,439 +313,473 @@ # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) # the group names will appear in their defined order. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = YES -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. SHOW_NAMESPACES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. -LAYOUT_FILE = +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file,$line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -#$version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file,$line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +#$version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = ./ \ ../derived/x86_64-linux-devel/config/ -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for # the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.cc \ *.hh -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. EXCLUDE = ./ufo -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. # Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -733,384 +788,532 @@ # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is adviced to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW! -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +#relpathmarker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). HTML_DYNAMIC_SECTIONS = NO -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) # can be grouped. DOCSET_FEEDNAME = "Doxygen generated docs" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen # will append .docset to the name. DOCSET_BUNDLE_ID = org.doxygen.Project -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file # content. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. GENERATE_QHP = NO -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. # The path specified is relative to the HTML output folder. -QCH_FILE = +QCH_FILE = -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see # http://doc.trolltech.com/qthelpproject.html#namespace -QHP_NAMESPACE = +QHP_NAMESPACE = -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see # http://doc.trolltech.com/qthelpproject.html#virtual-folders QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see # http://doc.trolltech.com/qthelpproject.html#custom-filters -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# ; +# Qt Help Project / Custom Filters. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# ; +# Qt Help Project / Filter Attributes. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated # .qhp file. -QHG_LOCATION = +QHG_LOCATION = -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. ENUM_VALUES_PER_LINE = 4 -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory # to force them to be regenerated. FORMULA_FONTSIZE = 10 +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the +# mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = YES -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = YES -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -1119,33 +1322,33 @@ # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -1154,10 +1357,10 @@ # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -1166,84 +1369,84 @@ # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = YES -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = YES -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# pointed to by INCLUDE_PATH will be searched when a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. INCLUDE_PATH = ../derived/x86_64-linux-devel/config/ -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. PREDEFINED = __restrict__= \ @@ -1252,265 +1455,268 @@ aligned= \ INSTANTIATE_SERIALIZE_METHODS= -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12195] openmsx/trunk/src From: - 2011-06-28 18:34:14 Revision: 12195 http://openmsx.svn.sourceforge.net/openmsx/?rev=12195&view=rev Author: manuelbi Date: 2011-06-28 18:34:08 +0000 (Tue, 28 Jun 2011) Log Message: ----------- Improve handing of re(g)zipped files (e.g. OMR). First look at the extension of the file as given on the command line, and if that doesn't work (e.g. .gz or .zip file), look at the original file name. Before this patch, re(g)zipped OMR files wouldn't be recognized, because only the original file name (inside the gzipped file) would be used, which is not OMR at all, usually. Modified Paths: -------------- openmsx/trunk/src/CommandLineParser.cc openmsx/trunk/src/CommandLineParser.hh Modified: openmsx/trunk/src/CommandLineParser.cc =================================================================== --- openmsx/trunk/src/CommandLineParser.cc 2011-06-28 18:33:47 UTC (rev 12194) +++ openmsx/trunk/src/CommandLineParser.cc 2011-06-28 18:34:08 UTC (rev 12195) @@ -287,22 +287,35 @@ bool CommandLineParser::parseFileName(const string& arg, deque& cmdLine) { - string originalName(arg); - try { - UserFileContext context; - File file(context.resolve(arg)); - originalName = file.getOriginalName(); - } catch (FileException&) { - // ignore + // First try the fileName as we get it from the commandline. This may + // be more interesting than the original fileName of a (g)zipped file: + // in case of an OMR file for instance, we want to select on the + // original extension, and not on the extension inside the gzipped + // file. + bool processed = parseFileNameInner(arg, arg, cmdLine); + if (!processed) { + try { + UserFileContext context; + File file(context.resolve(arg)); + string originalName = file.getOriginalName(); + processed = parseFileNameInner(originalName, arg, cmdLine); + } catch (FileException&) { + // ignore + } } - string extension = FileOperations::getExtension(originalName); + return processed; +} + +bool CommandLineParser::parseFileNameInner(const string& name, const string& originalPath, deque& cmdLine) +{ + string extension = FileOperations::getExtension(name); if (!extension.empty()) { // there is an extension FileTypeMap::const_iterator it = fileTypeMap.find(extension); if (it != fileTypeMap.end()) { try { // parse filetype - it->second->parseFileType(arg, cmdLine); + it->second->parseFileType(originalPath, cmdLine); return true; // file processed } catch (MSXException& e) { throw FatalError(e.getMessage()); @@ -312,7 +325,6 @@ return false; // unknown } - void CommandLineParser::parse(int argc, char** argv) { parseStatus = RUN; Modified: openmsx/trunk/src/CommandLineParser.hh =================================================================== --- openmsx/trunk/src/CommandLineParser.hh 2011-06-28 18:33:47 UTC (rev 12194) +++ openmsx/trunk/src/CommandLineParser.hh 2011-06-28 18:34:08 UTC (rev 12195) @@ -75,6 +75,8 @@ bool parseFileName(const std::string& arg, std::deque& cmdLine); + bool parseFileNameInner(const std::string& arg, const std::string& + originalPath, std::deque& cmdLine); bool parseOption(const std::string& arg, std::deque& cmdLine, unsigned prio); void registerFileTypes(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12194] openmsx/trunk/src/CommandLineParser.cc From: - 2011-06-28 18:33:53 Revision: 12194 http://openmsx.svn.sourceforge.net/openmsx/?rev=12194&view=rev Author: manuelbi Date: 2011-06-28 18:33:47 +0000 (Tue, 28 Jun 2011) Log Message: ----------- Use FileOperations::getExtension() to get the extension, instead of custom code. Modified Paths: -------------- openmsx/trunk/src/CommandLineParser.cc Modified: openmsx/trunk/src/CommandLineParser.cc =================================================================== --- openmsx/trunk/src/CommandLineParser.cc 2011-06-22 12:48:56 UTC (rev 12193) +++ openmsx/trunk/src/CommandLineParser.cc 2011-06-28 18:33:47 UTC (rev 12194) @@ -295,15 +295,14 @@ } catch (FileException&) { // ignore } - string::size_type begin = originalName.find_last_of('.'); - if (begin != string::npos) { + string extension = FileOperations::getExtension(originalName); + if (!extension.empty()) { // there is an extension - string extension = originalName.substr(begin + 1); - FileTypeMap::const_iterator it2 = fileTypeMap.find(extension); - if (it2 != fileTypeMap.end()) { + FileTypeMap::const_iterator it = fileTypeMap.find(extension); + if (it != fileTypeMap.end()) { try { // parse filetype - it2->second->parseFileType(arg, cmdLine); + it->second->parseFileType(arg, cmdLine); return true; // file processed } catch (MSXException& e) { throw FatalError(e.getMessage()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12193] openmsx/trunk/src/input From: - 2011-06-22 12:49:02 Revision: 12193 http://openmsx.svn.sourceforge.net/openmsx/?rev=12193&view=rev Author: mthuurne Date: 2011-06-22 12:48:56 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Reject 0-button joystick-like devices as joysticks. This avoids autoplugging an accelerometer if it is accidentally reported as a joystick by SDL. Modified Paths: -------------- openmsx/trunk/src/input/Joystick.cc openmsx/trunk/src/input/Joystick.hh Modified: openmsx/trunk/src/input/Joystick.cc =================================================================== --- openmsx/trunk/src/input/Joystick.cc 2011-06-22 10:01:01 UTC (rev 12192) +++ openmsx/trunk/src/input/Joystick.cc 2011-06-22 12:48:56 UTC (rev 12193) @@ -34,8 +34,19 @@ unsigned numJoysticks = SDL_NumJoysticks(); for (unsigned i = 0; i < numJoysticks; i++) { - controller.registerPluggable(new Joystick( - eventDistributor, stateChangeDistributor, i)); + SDL_Joystick* joystick = SDL_JoystickOpen(i); + if (joystick) { + // Avoid devices that have axes but no buttons, like accelerometers. + // SDL 1.2.14 in Linux has an issue where it rejects a device from + // /dev/input/event* if it has no buttons but does not reject a + // device from /dev/input/js* if it has no buttons, while + // accelerometers do end up being symlinked as a joystick in + // practice. + if (SDL_JoystickNumButtons(joystick) != 0) { + controller.registerPluggable(new Joystick( + eventDistributor, stateChangeDistributor, joystick)); + } + } } #endif } @@ -76,13 +87,13 @@ // the open/close calls. Joystick::Joystick(MSXEventDistributor& eventDistributor_, StateChangeDistributor& stateChangeDistributor_, - unsigned joyNum_) + SDL_Joystick* joystick_) : eventDistributor(eventDistributor_) , stateChangeDistributor(stateChangeDistributor_) + , joystick(joystick_) + , joyNum(SDL_JoystickIndex(joystick_)) , name("joystickX") // 'X' is filled in below - , desc(string(SDL_JoystickName(joyNum_))) - , joystick(SDL_JoystickOpen(joyNum_)) - , joyNum(joyNum_) + , desc(string(SDL_JoystickName(joyNum))) { const_cast(name)[8] = char('1' + joyNum); } Modified: openmsx/trunk/src/input/Joystick.hh =================================================================== --- openmsx/trunk/src/input/Joystick.hh 2011-06-22 10:01:01 UTC (rev 12192) +++ openmsx/trunk/src/input/Joystick.hh 2011-06-22 12:48:56 UTC (rev 12193) @@ -52,7 +52,7 @@ private: Joystick(MSXEventDistributor& eventDistributor, StateChangeDistributor& stateChangeDistributor, - unsigned joyNum); + SDL_Joystick* joystick); void plugHelper2(); byte calcInitialState(); @@ -69,10 +69,10 @@ MSXEventDistributor& eventDistributor; StateChangeDistributor& stateChangeDistributor; + SDL_Joystick* const joystick; + const unsigned joyNum; const std::string name; const std::string desc; - SDL_Joystick* const joystick; - const unsigned joyNum; byte status; #endif // SDL_JOYSTICK_DISABLED This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12192] openmsx-debugger/trunk/src/openmsx/ SspiNegotiateClient.cpp From: - 2011-06-22 10:01:07 Revision: 12192 http://openmsx.svn.sourceforge.net/openmsx/?rev=12192&view=rev Author: mthuurne Date: 2011-06-22 10:01:01 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Corrected mistake in previous commit: the wrong argument was cast. Modified Paths: -------------- openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp Modified: openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp =================================================================== --- openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp 2011-06-22 09:54:20 UTC (rev 12191) +++ openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp 2011-06-22 10:01:01 UTC (rev 12192) @@ -17,8 +17,8 @@ TimeStamp tsCredsExpiry; SECURITY_STATUS ss = AcquireCredentialsHandleW( NULL, - NEGOSSP_NAME_W, - const_cast(SECPKG_CRED_OUTBOUND), + const_cast(NEGOSSP_NAME_W), + SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12191] openmsx-debugger/trunk/src/openmsx From: - 2011-06-22 09:54:26 Revision: 12191 http://openmsx.svn.sourceforge.net/openmsx/?rev=12191&view=rev Author: mthuurne Date: 2011-06-22 09:54:20 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Fixed warnings about string constants being passed as non-const pointers, by using a const_cast at the last moment. Similar to the changes on openMSX made in r11911. Modified Paths: -------------- openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp openmsx-debugger/trunk/src/openmsx/SspiUtils.cpp openmsx-debugger/trunk/src/openmsx/SspiUtils.h Modified: openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp =================================================================== --- openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp 2011-06-22 06:27:23 UTC (rev 12190) +++ openmsx-debugger/trunk/src/openmsx/SspiNegotiateClient.cpp 2011-06-22 09:54:20 UTC (rev 12191) @@ -18,7 +18,7 @@ SECURITY_STATUS ss = AcquireCredentialsHandleW( NULL, NEGOSSP_NAME_W, - SECPKG_CRED_OUTBOUND, + const_cast(SECPKG_CRED_OUTBOUND), NULL, NULL, NULL, Modified: openmsx-debugger/trunk/src/openmsx/SspiUtils.cpp =================================================================== --- openmsx-debugger/trunk/src/openmsx/SspiUtils.cpp 2011-06-22 06:27:23 UTC (rev 12190) +++ openmsx-debugger/trunk/src/openmsx/SspiUtils.cpp 2011-06-22 09:54:20 UTC (rev 12191) @@ -14,7 +14,7 @@ namespace openmsx { namespace sspiutils { -SspiPackageBase::SspiPackageBase(StreamWrapper& userStream, wchar_t* securityPackage) +SspiPackageBase::SspiPackageBase(StreamWrapper& userStream, const SEC_WCHAR* securityPackage) : stream(userStream) , cbMaxTokenSize(GetPackageMaxTokenSize(securityPackage)) { @@ -218,10 +218,10 @@ return psd; } -unsigned long GetPackageMaxTokenSize(wchar_t* package) +unsigned long GetPackageMaxTokenSize(const SEC_WCHAR* package) { PSecPkgInfoW pkgInfo; - SECURITY_STATUS ss = QuerySecurityPackageInfoW(package, &pkgInfo); + SECURITY_STATUS ss = QuerySecurityPackageInfoW(const_cast(package), &pkgInfo); DebugPrintSecurityStatus("QuerySecurityPackageInfoW", ss); if (ss != SEC_E_OK) { return 0; Modified: openmsx-debugger/trunk/src/openmsx/SspiUtils.h =================================================================== --- openmsx-debugger/trunk/src/openmsx/SspiUtils.h 2011-06-22 06:27:23 UTC (rev 12190) +++ openmsx-debugger/trunk/src/openmsx/SspiUtils.h 2011-06-22 09:54:20 UTC (rev 12191) @@ -42,7 +42,7 @@ StreamWrapper& stream; const unsigned int cbMaxTokenSize; - SspiPackageBase(StreamWrapper& stream, wchar_t* securityPackage); + SspiPackageBase(StreamWrapper& stream, const SEC_WCHAR* securityPackage); ~SspiPackageBase(); }; @@ -63,7 +63,7 @@ void DebugPrintSecurityPrincipalName(PCtxtHandle phContext); void DebugPrintSecurityDescriptor(PSECURITY_DESCRIPTOR psd); PSECURITY_DESCRIPTOR CreateCurrentUserSecurityDescriptor(); -unsigned long GetPackageMaxTokenSize(wchar_t* package); +unsigned long GetPackageMaxTokenSize(const SEC_WCHAR* package); bool SendChunk(StreamWrapper& stream, void* buffer, uint32 cb); bool RecvChunk(StreamWrapper& stream, std::vector& buffer, uint32 cbMaxSize); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12190] openmsx-debugger/trunk/src/ VDPRegistersExplained.ui From: - 2011-06-22 06:27:29 Revision: 12190 http://openmsx.svn.sourceforge.net/openmsx/?rev=12190&view=rev Author: bifimsx Date: 2011-06-22 06:27:23 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Burst register cosmetic fix... it showed 1, but it should be 0. Modified Paths: -------------- openmsx-debugger/trunk/src/VDPRegistersExplained.ui Modified: openmsx-debugger/trunk/src/VDPRegistersExplained.ui =================================================================== --- openmsx-debugger/trunk/src/VDPRegistersExplained.ui 2011-06-22 06:00:12 UTC (rev 12189) +++ openmsx-debugger/trunk/src/VDPRegistersExplained.ui 2011-06-22 06:27:23 UTC (rev 12190) @@ -7099,7 +7099,7 @@ Color burst register 2 - 1 + 0 true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12189] openmsx-debugger/trunk/src/VDPRegViewer.cpp From: - 2011-06-22 06:00:18 Revision: 12189 http://openmsx.svn.sourceforge.net/openmsx/?rev=12189&view=rev Author: bifimsx Date: 2011-06-22 06:00:12 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Fixed R#2 interpretation in interleaved (or planar) modes. Modified Paths: -------------- openmsx-debugger/trunk/src/VDPRegViewer.cpp Modified: openmsx-debugger/trunk/src/VDPRegViewer.cpp =================================================================== --- openmsx-debugger/trunk/src/VDPRegViewer.cpp 2011-06-21 19:39:17 UTC (rev 12188) +++ openmsx-debugger/trunk/src/VDPRegViewer.cpp 2011-06-22 06:00:12 UTC (rev 12189) @@ -203,15 +203,12 @@ pushButton_1_7->setToolTip(""); // all A16 bits of regs < 7 - pushButton_2_6->setText("A16"); pushButton_4_5->setText("A16"); pushButton_6_5->setText("A16"); // all A15 - pushButton_2_5->setText("A15"); pushButton_4_4->setText("A15"); pushButton_6_4->setText("A15"); // all A14 - pushButton_2_4->setText("A14"); pushButton_4_3->setText("A14"); pushButton_6_3->setText("A14"); ////pushButton_0_5->setText("IE2"); @@ -474,6 +471,26 @@ ? "Reg 19 scanline interrupt enabled" : "Reg 19 scanline interrupt disabled"); + if (vdpid != VDP_TMS99X8) { + if (m == 20 || m == 28) { + pushButton_2_6->setText("0"); + pushButton_2_5->setText("A16"); + pushButton_2_4->setText("A15"); + pushButton_2_3->setText("A14"); + pushButton_2_2->setText("A13"); + pushButton_2_1->setText("A12"); + pushButton_2_0->setText("A11"); + } else { + pushButton_2_6->setText("A16"); + pushButton_2_5->setText("A15"); + pushButton_2_4->setText("A14"); + pushButton_2_3->setText("A13"); + pushButton_2_2->setText("A12"); + pushButton_2_1->setText("A11"); + pushButton_2_0->setText("A10"); + } + } + if (m == 28 && vdpid == VDP_V9958) { bool yjk = (regs[25] & 8); bool yae = (regs[25] & 16); @@ -516,8 +533,10 @@ // the pattern name table address must=mustbeone[row][basicscreen][2] ; - regtexttext = hex5( - ((255^must) & bitsused[row][basicscreen][2] & regs[2]) << 10); + long nameTable = ((255^must) & bitsused[row][basicscreen][2] & regs[2]) << 10; + if ((m == 20 || m == 28) && vdpid != VDP_TMS99X8) + nameTable = ((nameTable & 0xffff) << 1) | ((nameTable & 0x10000) >> 16); + regtexttext = hex5(nameTable); if ((must & regs[2]) != must ) { label_dec_r2->setText("" + regtexttext +""); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12188] openmsx/trunk/share/softwaredb.xml From: V - 2011-06-21 19:39:23 Revision: 12188 http://openmsx.svn.sourceforge.net/openmsx/?rev=12188&view=rev Author: Vampier Date: 2011-06-21 19:39:17 +0000 (Tue, 21 Jun 2011) Log Message: ----------- softwaredb update Modified Paths: -------------- openmsx/trunk/share/softwaredb.xml Modified: openmsx/trunk/share/softwaredb.xml =================================================================== --- openmsx/trunk/share/softwaredb.xml 2011-06-21 16:18:34 UTC (rev 12187) +++ openmsx/trunk/share/softwaredb.xml 2011-06-21 19:39:17 UTC (rev 12188) @@ -1,6 +1,6 @@ - + ES Authora7a2a867f7e90458f3e8614e8c227da944a6092cv1.0 / MSXDev2010 Entry Author4921e9ed9455e56371fb14481f1963957b1caeb1v1.1 / MSXDev2010 Entry + Author680be3a41a605ff95a4f5a8d6d1b79714439e1aev1.2 / Post MSXDev2010 Entry Quarth @@ -11924,6 +11925,6 @@ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12187] openmsx-debugger/trunk/src From: - 2011-06-21 16:18:40 Revision: 12187 http://openmsx.svn.sourceforge.net/openmsx/?rev=12187&view=rev Author: bifimsx Date: 2011-06-21 16:18:34 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Several fixes: 1. SCREEN 7 paging works like SCREEN 8 2. 256 lines to decode, but number of lines to display was 255 3. Sprite enable decoding was done the wrong way Modified Paths: -------------- openmsx-debugger/trunk/src/BitMapViewer.cpp openmsx-debugger/trunk/src/BitMapViewer.ui openmsx-debugger/trunk/src/VDPRegViewer.cpp Modified: openmsx-debugger/trunk/src/BitMapViewer.cpp =================================================================== --- openmsx-debugger/trunk/src/BitMapViewer.cpp 2011-06-20 01:26:28 UTC (rev 12186) +++ openmsx-debugger/trunk/src/BitMapViewer.cpp 2011-06-21 16:18:34 UTC (rev 12187) @@ -151,7 +151,7 @@ static const int m1[4] = { 0x00000, 0x08000, 0x10000, 0x18000 }; printf("\nvoid BitMapViewer::on_showPage_currentIndexChanged( int %i);\n", index); - if (screenMod > 7) index *= 2; + if (screenMod >= 7) index *= 2; int vramAddress = m1[index]; printf("vramAddress %i\n", vramAddress); imageWidget->setVramAddress(vramAddress); Modified: openmsx-debugger/trunk/src/BitMapViewer.ui =================================================================== --- openmsx-debugger/trunk/src/BitMapViewer.ui 2011-06-20 01:26:28 UTC (rev 12186) +++ openmsx-debugger/trunk/src/BitMapViewer.ui 2011-06-21 16:18:34 UTC (rev 12187) @@ -133,7 +133,7 @@ - 255 + 256 Modified: openmsx-debugger/trunk/src/VDPRegViewer.cpp =================================================================== --- openmsx-debugger/trunk/src/VDPRegViewer.cpp 2011-06-20 01:26:28 UTC (rev 12186) +++ openmsx-debugger/trunk/src/VDPRegViewer.cpp 2011-06-21 16:18:34 UTC (rev 12187) @@ -457,7 +457,7 @@ i->mustBeSet((mustbeone[ (vdpid == VDP_TMS99X8)?0:1 ][basicscreen][r] & (1 << b)) ? true : false); // if A8 of R5 is a 'mustbeone' then we indicate this for A9 also // This bit is cleared in the table since it isn't used in the Sprite - // Attribute Table address calculation otherwise, but will only impact the + // Attribute Table address calculation otherwise, but will only impact the // Sprite Color Table if (r==5 && b==2 && vdpid!=VDP_TMS99X8 && mustbeone[1][basicscreen][5] ){ i->mustBeSet(true); @@ -595,8 +595,8 @@ ? "Color 0 uses the color registers" : "Color 0 is transparent (=shows border)"); label_dec_spd->setText((regs[8] & 2) - ? "Sprites enabled" - : "Sprites disabled"); + ? "Sprites disabled" + : "Sprites enabled"); label_dec_ln->setText((regs[9] & 128) ? "212" : "192"); label_dec_il->setText((regs[9] & 8) ? "interlaced" : "non-interlaced"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12186] openmsx/trunk/src From: - 2011-06-20 01:26:34 Revision: 12186 http://openmsx.svn.sourceforge.net/openmsx/?rev=12186&view=rev Author: mthuurne Date: 2011-06-20 01:26:28 +0000 (Mon, 20 Jun 2011) Log Message: ----------- Support MIDI output to existing Core MIDI devices. This is what you need to access real MIDI hardware, but you can also connect to applications via IAC or via a network session. Many thanks to Valken for explaining MIDI configuration on OS X to me and for writing the prototype of this new class. Modified Paths: -------------- openmsx/trunk/src/PluggableFactory.cc openmsx/trunk/src/serial/MidiOutCoreMIDI.cc openmsx/trunk/src/serial/MidiOutCoreMIDI.hh Modified: openmsx/trunk/src/PluggableFactory.cc =================================================================== --- openmsx/trunk/src/PluggableFactory.cc 2011-06-20 00:37:03 UTC (rev 12185) +++ openmsx/trunk/src/PluggableFactory.cc 2011-06-20 01:26:28 UTC (rev 12186) @@ -88,6 +88,7 @@ #endif #if defined(__APPLE__) controller.registerPluggable(new MidiOutCoreMIDIVirtual()); + MidiOutCoreMIDI::registerAll(controller); #endif // Printers Modified: openmsx/trunk/src/serial/MidiOutCoreMIDI.cc =================================================================== --- openmsx/trunk/src/serial/MidiOutCoreMIDI.cc 2011-06-20 00:37:03 UTC (rev 12185) +++ openmsx/trunk/src/serial/MidiOutCoreMIDI.cc 2011-06-20 01:26:28 UTC (rev 12186) @@ -3,6 +3,7 @@ #if defined(__APPLE__) #include "MidiOutCoreMIDI.hh" +#include "PluggingController.hh" #include "PlugException.hh" #include "serialize.hh" #include @@ -10,6 +11,102 @@ namespace openmsx { +// MidiOutCoreMIDI =========================================================== + +void MidiOutCoreMIDI::registerAll(PluggingController& controller) +{ + ItemCount numberOfEndpoints = MIDIGetNumberOfDestinations(); + for (ItemCount i = 0; i < numberOfEndpoints; i++) { + MIDIEndpointRef endpoint = MIDIGetDestination(i); + if (endpoint) { + controller.registerPluggable(new MidiOutCoreMIDI(endpoint)); + } + } +} + +MidiOutCoreMIDI::MidiOutCoreMIDI(MIDIEndpointRef endpoint_) + : endpoint(endpoint_) +{ + // Get a user-presentable name for the endpoint. + CFStringRef midiDeviceName; + OSStatus status = MIDIObjectGetStringProperty( + endpoint, kMIDIPropertyDisplayName, &midiDeviceName); + if (status) { + status = MIDIObjectGetStringProperty( + endpoint, kMIDIPropertyName, &midiDeviceName); + } + if (status) { + name = "Nameless endpoint"; + } else { + name = StringOp::fromCFString(midiDeviceName); + CFRelease(midiDeviceName); + } +} + +void MidiOutCoreMIDI::plugHelper(Connector& /*connector*/, + EmuTime::param /*time*/) +{ + // Create client. + if (OSStatus status = MIDIClientCreate(CFSTR("openMSX"), NULL, NULL, &client)) { + throw PlugException(StringOp::Builder() << + "Failed to create MIDI client (" << status << ")"); + } + // Create output port. + if (OSStatus status = MIDIOutputPortCreate(client, CFSTR("Output"), &port)) { + MIDIClientDispose(client); + client = NULL; + throw PlugException(StringOp::Builder() << + "Failed to create MIDI port (" << status << ")"); + } +} + +void MidiOutCoreMIDI::unplugHelper(EmuTime::param /*time*/) +{ + // Dispose of the client; this automatically disposes of the port as well. + if (OSStatus status = MIDIClientDispose(client)) { + fprintf(stderr, "Failed to dispose of MIDI client (%d)\n", status); + } + port = NULL; + client = NULL; +} + +const std::string& MidiOutCoreMIDI::getName() const +{ + return name; +} + +const std::string MidiOutCoreMIDI::getDescription() const +{ + return "Sends MIDI events to an existing CoreMIDI destination."; +} + +void MidiOutCoreMIDI::recvByte(byte value, EmuTime::param /*time*/) +{ + // TODO: It would be better to schedule events based on EmuTime. + MIDITimeStamp abstime = 0; + + Byte buffer[256]; + MIDIPacketList *myPacketList = (MIDIPacketList *)buffer; + MIDIPacket *myPacket = MIDIPacketListInit(myPacketList); + myPacket = MIDIPacketListAdd( + myPacketList, sizeof(buffer), myPacket, abstime, 1, &value); + + if (OSStatus status = MIDISend(port, endpoint, myPacketList)) { + fprintf(stderr, "Failed to send MIDI data (%d)\n", status); + } else { + //fprintf(stderr, "MIDI send OK: %02X\n", value); + } +} + +template +void MidiOutCoreMIDI::serialize(Archive& /*ar*/, unsigned /*version*/) +{ +} +INSTANTIATE_SERIALIZE_METHODS(MidiOutCoreMIDI); +REGISTER_POLYMORPHIC_INITIALIZER(Pluggable, MidiOutCoreMIDI, "MidiOutCoreMIDI"); + +// MidiOutCoreMIDIVirtual ==================================================== + MidiOutCoreMIDIVirtual:: MidiOutCoreMIDIVirtual() : client(NULL) , endpoint(NULL) @@ -26,6 +123,7 @@ } // Create endpoint. if (OSStatus status = MIDISourceCreate(client, CFSTR("openMSX"), &endpoint)) { + MIDIClientDispose(client); throw PlugException(StringOp::Builder() << "Failed to create MIDI endpoint (" << status << ")"); } @@ -48,13 +146,13 @@ const std::string& MidiOutCoreMIDIVirtual::getName() const { - static const std::string name("virtual-endpoint"); + static const std::string name("Virtual"); return name; } const std::string MidiOutCoreMIDIVirtual::getDescription() const { - return "Outputs MIDI events via the CoreMIDI framework."; + return "Sends MIDI events from a newly created CoreMIDI virtual source."; } void MidiOutCoreMIDIVirtual::recvByte(byte value, EmuTime::param /*time*/) @@ -62,10 +160,11 @@ // TODO: It would be better to schedule events based on EmuTime. MIDITimeStamp abstime = mach_absolute_time(); - byte buffer[256]; + Byte buffer[256]; MIDIPacketList *myPacketList = (MIDIPacketList *)buffer; MIDIPacket *myPacket = MIDIPacketListInit(myPacketList); - myPacket = MIDIPacketListAdd(myPacketList, sizeof(buffer), myPacket, abstime, 1, &value); + myPacket = MIDIPacketListAdd( + myPacketList, sizeof(buffer), myPacket, abstime, 1, &value); if (OSStatus status = MIDIReceived(endpoint, myPacketList)) { fprintf(stderr, "Failed to send MIDI data (%d)\n", status); Modified: openmsx/trunk/src/serial/MidiOutCoreMIDI.hh =================================================================== --- openmsx/trunk/src/serial/MidiOutCoreMIDI.hh 2011-06-20 00:37:03 UTC (rev 12185) +++ openmsx/trunk/src/serial/MidiOutCoreMIDI.hh 2011-06-20 01:26:28 UTC (rev 12186) @@ -10,6 +10,43 @@ namespace openmsx { +class PluggingController; + +/** Sends MIDI events to an existing CoreMIDI destination. + */ +class MidiOutCoreMIDI : public MidiOutDevice +{ +public: + static void registerAll(PluggingController& controller); + + // Pluggable + virtual void plugHelper(Connector& connector, EmuTime::param time); + virtual void unplugHelper(EmuTime::param time); + virtual const std::string& getName() const; + virtual const std::string getDescription() const; + + // SerialDataInterface (part) + virtual void recvByte(byte value, EmuTime::param time); + + template + void serialize(Archive& ar, unsigned version); + + +private: + explicit MidiOutCoreMIDI(MIDIEndpointRef endpoint); + + MIDIClientRef client; + MIDIPortRef port; + MIDIEndpointRef endpoint; + + std::string name; +}; + +/** Sends MIDI events from a newly created CoreMIDI virtual source. + * This class acts as a MIDI input, unlike the other class that sends events + * to a MIDI output. It is similar to using an IAC bus, but doesn't require + * prior configuration to work. + */ class MidiOutCoreMIDIVirtual : public MidiOutDevice { public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12185] openmsx/trunk/src/utils From: - 2011-06-20 00:37:10 Revision: 12185 http://openmsx.svn.sourceforge.net/openmsx/?rev=12185&view=rev Author: mthuurne Date: 2011-06-20 00:37:03 +0000 (Mon, 20 Jun 2011) Log Message: ----------- On Mac OS X, add a convenience method for converting CFString to a UTF8 std::string. Modified Paths: -------------- openmsx/trunk/src/utils/StringOp.cc openmsx/trunk/src/utils/StringOp.hh Modified: openmsx/trunk/src/utils/StringOp.cc =================================================================== --- openmsx/trunk/src/utils/StringOp.cc 2011-06-14 03:06:43 UTC (rev 12184) +++ openmsx/trunk/src/utils/StringOp.cc 2011-06-20 00:37:03 UTC (rev 12185) @@ -318,4 +318,29 @@ } } +#if defined(__APPLE__) + +std::string fromCFString(CFStringRef str) +{ + // Try the quick route first. + const char *cstr = CFStringGetCStringPtr(str, kCFStringEncodingUTF8); + if (cstr) { + // String was already in UTF8 encoding. + return std::string(cstr); + } + + // Convert to UTF8 encoding. + CFIndex len = CFStringGetLength(str); + CFRange range = CFRangeMake(0, len); + CFIndex usedBufLen = 0; + CFStringGetBytes( + str, range, kCFStringEncodingUTF8, '?', false, NULL, len, &usedBufLen); + UInt8 buffer[usedBufLen]; + CFStringGetBytes( + str, range, kCFStringEncodingUTF8, '?', false, buffer, len, &usedBufLen); + return std::string(reinterpret_cast(buffer), usedBufLen); +} + +#endif + } // namespace StringOp Modified: openmsx/trunk/src/utils/StringOp.hh =================================================================== --- openmsx/trunk/src/utils/StringOp.hh 2011-06-14 03:06:43 UTC (rev 12184) +++ openmsx/trunk/src/utils/StringOp.hh 2011-06-20 00:37:03 UTC (rev 12185) @@ -9,6 +9,9 @@ #include #include #include +#if defined(__APPLE__) +#include +#endif namespace StringOp { @@ -107,6 +110,10 @@ return strcasecmp(s1.c_str(), s2.c_str()) < 0; } }; + +#if defined(__APPLE__) + std::string fromCFString(CFStringRef str); +#endif } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12184] openmsx/trunk From: - 2011-06-14 03:06:50 Revision: 12184 http://openmsx.svn.sourceforge.net/openmsx/?rev=12184&view=rev Author: mthuurne Date: 2011-06-14 03:06:43 +0000 (Tue, 14 Jun 2011) Log Message: ----------- Add support for MIDI output to a virtual endpoint under CoreMIDI on Mac OS X. Thanks to Valken for the prototype that this feature is loosely based on. The current version sends MIDI events for the current host time, it would be better to convert the given EmuTime to host time instead. Modified Paths: -------------- openmsx/trunk/build/platform-darwin.mk openmsx/trunk/src/PluggableFactory.cc openmsx/trunk/src/serial/node.mk Added Paths: ----------- openmsx/trunk/src/serial/MidiOutCoreMIDI.cc openmsx/trunk/src/serial/MidiOutCoreMIDI.hh Modified: openmsx/trunk/build/platform-darwin.mk =================================================================== --- openmsx/trunk/build/platform-darwin.mk 2011-06-13 20:10:48 UTC (rev 12183) +++ openmsx/trunk/build/platform-darwin.mk 2011-06-14 03:06:43 UTC (rev 12184) @@ -79,3 +79,6 @@ # Nothing to define. endif + +# Link against CoreMIDI. +LINK_FLAGS+=-framework CoreMIDI Modified: openmsx/trunk/src/PluggableFactory.cc =================================================================== --- openmsx/trunk/src/PluggableFactory.cc 2011-06-13 20:10:48 UTC (rev 12183) +++ openmsx/trunk/src/PluggableFactory.cc 2011-06-14 03:06:43 UTC (rev 12184) @@ -24,6 +24,9 @@ #include "MidiInWindows.hh" #include "MidiOutWindows.hh" #endif +#if defined(__APPLE__) +#include "MidiOutCoreMIDI.hh" +#endif namespace openmsx { @@ -83,6 +86,9 @@ MidiInWindows::registerAll(eventDistributor, scheduler, controller); MidiOutWindows::registerAll(controller); #endif +#if defined(__APPLE__) + controller.registerPluggable(new MidiOutCoreMIDIVirtual()); +#endif // Printers controller.registerPluggable(new ImagePrinterMSX(motherBoard)); Added: openmsx/trunk/src/serial/MidiOutCoreMIDI.cc =================================================================== --- openmsx/trunk/src/serial/MidiOutCoreMIDI.cc (rev 0) +++ openmsx/trunk/src/serial/MidiOutCoreMIDI.cc 2011-06-14 03:06:43 UTC (rev 12184) @@ -0,0 +1,86 @@ +//Id$+ +#if defined(__APPLE__) + +#include "MidiOutCoreMIDI.hh" +#include "PlugException.hh" +#include "serialize.hh" +#include + + +namespace openmsx { + +MidiOutCoreMIDIVirtual:: MidiOutCoreMIDIVirtual() + : client(NULL) + , endpoint(NULL) +{ +} + +void MidiOutCoreMIDIVirtual::plugHelper(Connector& /*connector*/, + EmuTime::param /*time*/) +{ + // Create client. + if (OSStatus status = MIDIClientCreate(CFSTR("openMSX"), NULL, NULL, &client)) { + throw PlugException(StringOp::Builder() << + "Failed to create MIDI client (" << status << ")"); + } + // Create endpoint. + if (OSStatus status = MIDISourceCreate(client, CFSTR("openMSX"), &endpoint)) { + throw PlugException(StringOp::Builder() << + "Failed to create MIDI endpoint (" << status << ")"); + } + + //struct mach_timebase_info timebaseInfo; + //mach_timebase_info(&timebaseInfo); +} + +void MidiOutCoreMIDIVirtual::unplugHelper(EmuTime::param /*time*/) +{ + if (OSStatus status = MIDIEndpointDispose(endpoint)) { + fprintf(stderr, "Failed to dispose of MIDI port (%d)\n", status); + } + endpoint = NULL; + if (OSStatus status = MIDIClientDispose(client)) { + fprintf(stderr, "Failed to dispose of MIDI client (%d)\n", status); + } + client = NULL; +} + +const std::string& MidiOutCoreMIDIVirtual::getName() const +{ + static const std::string name("virtual-endpoint"); + return name; +} + +const std::string MidiOutCoreMIDIVirtual::getDescription() const +{ + return "Outputs MIDI events via the CoreMIDI framework."; +} + +void MidiOutCoreMIDIVirtual::recvByte(byte value, EmuTime::param /*time*/) +{ + // TODO: It would be better to schedule events based on EmuTime. + MIDITimeStamp abstime = mach_absolute_time(); + + byte buffer[256]; + MIDIPacketList *myPacketList = (MIDIPacketList *)buffer; + MIDIPacket *myPacket = MIDIPacketListInit(myPacketList); + myPacket = MIDIPacketListAdd(myPacketList, sizeof(buffer), myPacket, abstime, 1, &value); + + if (OSStatus status = MIDIReceived(endpoint, myPacketList)) { + fprintf(stderr, "Failed to send MIDI data (%d)\n", status); + } else { + //fprintf(stderr, "MIDI send OK: %02X\n", value); + } +} + +template +void MidiOutCoreMIDIVirtual::serialize(Archive& /*ar*/, unsigned /*version*/) +{ +} +INSTANTIATE_SERIALIZE_METHODS(MidiOutCoreMIDIVirtual); +REGISTER_POLYMORPHIC_INITIALIZER(Pluggable, MidiOutCoreMIDIVirtual, "MidiOutCoreMIDIVirtual"); + +} // namespace openmsx + +#endif // defined(__APPLE__) Property changes on: openmsx/trunk/src/serial/MidiOutCoreMIDI.cc ___________________________________________________________________ Added: svn:keywords + Id Added: openmsx/trunk/src/serial/MidiOutCoreMIDI.hh =================================================================== --- openmsx/trunk/src/serial/MidiOutCoreMIDI.hh (rev 0) +++ openmsx/trunk/src/serial/MidiOutCoreMIDI.hh 2011-06-14 03:06:43 UTC (rev 12184) @@ -0,0 +1,38 @@ +//$Id$+ +#ifndef MIDIOUTCOREMIDI_HH +#define MIDIOUTCOREMIDI_HH + +#if defined(__APPLE__) + +#include "MidiOutDevice.hh" +#include + +namespace openmsx { + +class MidiOutCoreMIDIVirtual : public MidiOutDevice +{ +public: + explicit MidiOutCoreMIDIVirtual(); + + // Pluggable + virtual void plugHelper(Connector& connector, EmuTime::param time); + virtual void unplugHelper(EmuTime::param time); + virtual const std::string& getName() const; + virtual const std::string getDescription() const; + + // SerialDataInterface (part) + virtual void recvByte(byte value, EmuTime::param time); + + template + void serialize(Archive& ar, unsigned version); + +private: + MIDIClientRef client; + MIDIEndpointRef endpoint; +}; + +} // namespace openmsx + +#endif // defined(__APPLE__) +#endif // MIDIOUTCOREMIDI_HH Property changes on: openmsx/trunk/src/serial/MidiOutCoreMIDI.hh ___________________________________________________________________ Added: svn:keywords + Id Modified: openmsx/trunk/src/serial/node.mk =================================================================== --- openmsx/trunk/src/serial/node.mk 2011-06-13 20:10:48 UTC (rev 12183) +++ openmsx/trunk/src/serial/node.mk 2011-06-14 03:06:43 UTC (rev 12184) @@ -11,6 +11,7 @@ MidiInDevice DummyMidiInDevice MidiInConnector MidiInReader \ MidiOutDevice DummyMidiOutDevice MidiOutConnector MidiOutLogger \ MidiInWindows MidiOutWindows Midi_w32 \ + MidiOutCoreMIDI \ RS232Connector RS232Device MSXRS232 DummyRS232Device RS232Tester HDR_ONLY:= \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12183] openmsx/trunk/build/libraries.py From: - 2011-06-13 20:10:54 Revision: 12183 http://openmsx.svn.sourceforge.net/openmsx/?rev=12183&view=rev Author: mthuurne Date: 2011-06-13 20:10:48 +0000 (Mon, 13 Jun 2011) Log Message: ----------- Look for tclConfig.sh in /lib/tcl/tcl as well. Fixes build on OpenBSD. Modified Paths: -------------- openmsx/trunk/build/libraries.py Modified: openmsx/trunk/build/libraries.py =================================================================== --- openmsx/trunk/build/libraries.py 2011-06-12 20:20:56 UTC (rev 12182) +++ openmsx/trunk/build/libraries.py 2011-06-13 20:10:48 UTC (rev 12183) @@ -417,7 +417,7 @@ roots = (distroRoot, ) for root in roots: if isdir(root): - for libdir in ('lib', 'lib64'): + for libdir in ('lib', 'lib64', 'lib/tcl'): libpath = root + '/' + libdir if isdir(libpath): yield libpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12182] openmsx/trunk/src/laserdisc From: - 2011-06-12 20:21:03 Revision: 12182 http://openmsx.svn.sourceforge.net/openmsx/?rev=12182&view=rev Author: seanyoung Date: 2011-06-12 20:20:56 +0000 (Sun, 12 Jun 2011) Log Message: ----------- Badlands has some even/odd frame oddities which can only be deinterlaced at 60Hz Modified Paths: -------------- openmsx/trunk/src/laserdisc/LaserdiscPlayer.cc openmsx/trunk/src/laserdisc/LaserdiscPlayer.hh openmsx/trunk/src/laserdisc/OggReader.cc openmsx/trunk/src/laserdisc/OggReader.hh Modified: openmsx/trunk/src/laserdisc/LaserdiscPlayer.cc =================================================================== --- openmsx/trunk/src/laserdisc/LaserdiscPlayer.cc 2011-06-12 09:13:37 UTC (rev 12181) +++ openmsx/trunk/src/laserdisc/LaserdiscPlayer.cc 2011-06-12 20:20:56 UTC (rev 12182) @@ -168,8 +168,8 @@ Clock<60000, 1001> frameClock(time); // The video is 29.97Hz, however we need to do vblank processing // at the full 59.94Hz - setSyncPoint(frameClock + 1, VBLANK); - setSyncPoint(frameClock + 2, FRAME); // FRAME will execute VBLANK + setSyncPoint(frameClock + 1, ODD_FRAME); + setSyncPoint(frameClock + 2, EVEN_FRAME); } // The protocol used to communicate over the cable for commands to the @@ -691,8 +691,11 @@ seeking = false; PRT_DEBUG("Laserdisc: ACK cleared"); break; - case FRAME: - // end of video + case ODD_FRAME: + if (video.get() == NULL || video->getFrameRate() != 60) + break; + + case EVEN_FRAME: if (playerState != PLAYER_STOPPED && currentFrame > video->getFrames()) { playerState = PLAYER_STOPPED; @@ -702,9 +705,20 @@ renderer->frameStart(time); if (isVideoOutputAvailable(time)) { - video->getFrameNo(*rawFrame, currentFrame); + int frame = currentFrame; - nextFrame(time); + if (video->getFrameRate() == 60) { + frame *= 2; + if (userdata == ODD_FRAME) { + frame++; + } + } + + video->getFrameNo(*rawFrame, frame); + + if (userdata == EVEN_FRAME) { + nextFrame(time); + } } else { renderer->drawBlank(0, 128, 196); } @@ -715,9 +729,12 @@ loadingIndicator->update(seeking || sampleReads > 500); sampleReads = 0; - scheduleDisplayStart(time); - // fall-through - case VBLANK: + if (userdata == EVEN_FRAME) { + scheduleDisplayStart(time); + } + } + + if (userdata == EVEN_FRAME || userdata == ODD_FRAME) { // Processing of the remote control happens at each frame // (even and odd, so at 59.94Hz) if (remoteProtocol == IR_NEC) { @@ -1075,7 +1092,10 @@ playingFromSample = samplePos; if (needseek) { - video->seek(currentFrame, samplePos); + if (video->getFrameRate() == 60) + video->seek(currentFrame * 2, samplePos); + else + video->seek(currentFrame, samplePos); } } @@ -1118,7 +1138,10 @@ long long samplePos = (toframe - 1ll) * 1001ll * video->getSampleRate() / 30000ll; - video->seek(toframe, samplePos); + if (video->getFrameRate() == 60) + video->seek(toframe * 2, samplePos); + else + video->seek(toframe, samplePos); playerState = PLAYER_STILL; playingFromSample = samplePos; @@ -1317,7 +1340,10 @@ } unsigned sample = getCurrentSample(getCurrentTime()); - video->seek(currentFrame, sample); + if (video->getFrameRate() == 60) + video->seek(currentFrame * 2, sample); + else + video->seek(currentFrame, sample); lastPlayedSample = sample; } } Modified: openmsx/trunk/src/laserdisc/LaserdiscPlayer.hh =================================================================== --- openmsx/trunk/src/laserdisc/LaserdiscPlayer.hh 2011-06-12 09:13:37 UTC (rev 12181) +++ openmsx/trunk/src/laserdisc/LaserdiscPlayer.hh 2011-06-12 20:20:56 UTC (rev 12182) @@ -162,8 +162,8 @@ StereoMode stereoMode; enum SyncType { - FRAME, - VBLANK, + EVEN_FRAME, + ODD_FRAME, ACK }; Modified: openmsx/trunk/src/laserdisc/OggReader.cc =================================================================== --- openmsx/trunk/src/laserdisc/OggReader.cc 2011-06-12 09:13:37 UTC (rev 12181) +++ openmsx/trunk/src/laserdisc/OggReader.cc 2011-06-12 20:20:56 UTC (rev 12182) @@ -150,8 +150,12 @@ throw MSXException("Video must be size 640x480"); } - if (ti.fps_numerator != 30000 || ti.fps_denominator != 1001) { - throw MSXException("Video must be 29.97Hz"); + if (ti.fps_numerator == 30000 && ti.fps_denominator == 1001) { + frameRate = 30; + } else if (ti.fps_numerator == 60000 && ti.fps_denominator == 1001) { + frameRate = 60; + } else { + throw MSXException("Video frame rate must be 59.94Hz or 29.97Hz"); } // FIXME: Support YUV444 before release Modified: openmsx/trunk/src/laserdisc/OggReader.hh =================================================================== --- openmsx/trunk/src/laserdisc/OggReader.hh 2011-06-12 09:13:37 UTC (rev 12181) +++ openmsx/trunk/src/laserdisc/OggReader.hh 2011-06-12 20:20:56 UTC (rev 12182) @@ -47,6 +47,7 @@ void getFrameNo(RawFrame& frame, int frameno); const AudioFragment* getAudio(unsigned sample); int getFrames() const; + int getFrameRate() const { return frameRate; } // metadata bool stopFrame(int frame) const; @@ -91,6 +92,7 @@ // video th_dec_ctx* theora; + int frameRate; int keyFrame; int currentFrame; int granuleShift; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12181] openmsx/trunk/src From: - 2011-06-12 09:13:43 Revision: 12181 http://openmsx.svn.sourceforge.net/openmsx/?rev=12181&view=rev Author: manuelbi Date: 2011-06-12 09:13:37 +0000 (Sun, 12 Jun 2011) Log Message: ----------- Adjust PSG (and SCC) name when using MegaFlashROM SCC+. Now you can see which PSG is from MegaFlashROM SCC+ and the same for the SCC-I. Modified Paths: -------------- openmsx/trunk/src/memory/MegaFlashRomSCCPlus.cc openmsx/trunk/src/sound/AY8910.cc openmsx/trunk/src/sound/AY8910.hh openmsx/trunk/src/sound/MSXPSG.cc Modified: openmsx/trunk/src/memory/MegaFlashRomSCCPlus.cc =================================================================== --- openmsx/trunk/src/memory/MegaFlashRomSCCPlus.cc 2011-06-11 17:36:14 UTC (rev 12180) +++ openmsx/trunk/src/memory/MegaFlashRomSCCPlus.cc 2011-06-12 09:13:37 UTC (rev 12181) @@ -48,9 +48,9 @@ const XMLElement& config, std::auto_ptr rom_) : MSXRom(motherBoard, config, rom_) - , scc(new SCC(motherBoard, "SCC", config, getCurrentTime(), + , scc(new SCC(motherBoard, "MFR SCC+ SCC-I", config, getCurrentTime(), SCC::SCC_Compatible)) - , psg(new AY8910(motherBoard, DummyAY8910Peripehery::instance(), config, + , psg(new AY8910(motherBoard, "MFR SCC+ PSG", DummyAY8910Peripehery::instance(), config, getCurrentTime())) , flash(new AmdFlash(motherBoard, *rom, std::vector(sectorSizes, sectorSizes + 19), Modified: openmsx/trunk/src/sound/AY8910.cc =================================================================== --- openmsx/trunk/src/sound/AY8910.cc 2011-06-11 17:36:14 UTC (rev 12180) +++ openmsx/trunk/src/sound/AY8910.cc 2011-06-12 09:13:37 UTC (rev 12181) @@ -479,9 +479,10 @@ // AY8910 main class: -AY8910::AY8910(MSXMotherBoard& motherBoard, AY8910Periphery& periphery_, - const XMLElement& config, EmuTime::param time) - : SoundDevice(motherBoard.getMSXMixer(), "PSG", "PSG", 3) +AY8910::AY8910(MSXMotherBoard& motherBoard, const std::string& name, + AY8910Periphery& periphery_, const XMLElement& config, + EmuTime::param time) + : SoundDevice(motherBoard.getMSXMixer(), name, "PSG", 3) , Resample(motherBoard.getReactor().getGlobalSettings().getResampleSetting()) , cliComm(motherBoard.getMSXCliComm()) , periphery(periphery_) Modified: openmsx/trunk/src/sound/AY8910.hh =================================================================== --- openmsx/trunk/src/sound/AY8910.hh 2011-06-11 17:36:14 UTC (rev 12180) +++ openmsx/trunk/src/sound/AY8910.hh 2011-06-12 09:13:37 UTC (rev 12181) @@ -24,8 +24,9 @@ class AY8910 : public SoundDevice, private Resample { public: - AY8910(MSXMotherBoard& motherBoard, AY8910Periphery& periphery_, - const XMLElement& config, EmuTime::param time); + AY8910(MSXMotherBoard& motherBoard, const std::string& name, + AY8910Periphery& periphery_, const XMLElement& config, + EmuTime::param time); virtual ~AY8910(); byte readRegister(unsigned reg, EmuTime::param time); Modified: openmsx/trunk/src/sound/MSXPSG.cc =================================================================== --- openmsx/trunk/src/sound/MSXPSG.cc 2011-06-11 17:36:14 UTC (rev 12180) +++ openmsx/trunk/src/sound/MSXPSG.cc 2011-06-12 09:13:37 UTC (rev 12181) @@ -40,7 +40,7 @@ // must come after initialisation of ports EmuTime::param time = getCurrentTime(); - ay8910.reset(new AY8910(motherBoard, *this, config, time)); + ay8910.reset(new AY8910(motherBoard, "PSG", *this, config, time)); reset(time); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [openMSX-commits] SF.net SVN: openmsx:[12180] openmsx/trunk/share/scripts/osd_menu.tcl From: - 2011-06-11 17:36:20 Revision: 12180 http://openmsx.svn.sourceforge.net/openmsx/?rev=12180&view=rev Author: manuelbi Date: 2011-06-11 17:36:14 +0000 (Sat, 11 Jun 2011) Log Message: ----------- Added support for tape in OSD menu. Also made sure you get clear errors when there is no cassette player. Added the same nice error for when there are no disk drives and you try to use a disk image. Modified Paths: -------------- openmsx/trunk/share/scripts/osd_menu.tcl Modified: openmsx/trunk/share/scripts/osd_menu.tcl =================================================================== --- openmsx/trunk/share/scripts/osd_menu.tcl 2011-06-11 17:33:40 UTC (rev 12179) +++ openmsx/trunk/share/scripts/osd_menu.tcl 2011-06-11 17:36:14 UTC (rev 12180) @@ -203,6 +203,7 @@ user_setting create string osd_rom_path "OSD Rom Load Menu Last Known Path"$env(HOME) user_setting create string osd_disk_path "OSD Disk Load Menu Last Known Path" $env(HOME) +user_setting create string osd_tape_path "OSD Tape Load Menu Last Known Path"$env(HOME) if {![file exists $::osd_rom_path]} { # revert to default (should always exist) unset ::osd_rom_path @@ -213,6 +214,11 @@ unset ::osd_disk_path } +if {![file exists$::osd_tape_path]} { + # revert to default (should always exist) + unset ::osd_tape_path +} + proc main_menu_open {} { variable main_menu do_menu_open $main_menu @@ -422,7 +428,9 @@ { text "Load ROM..." actions { A { osd_menu::menu_create [osd_menu::menu_create_ROM_list$::osd_rom_path] }}} { text "Insert Disk..." - actions { A { osd_menu::menu_create [osd_menu::menu_create_disk_list $::osd_disk_path] }} + actions { A { if {[catch diska]} { osd::display_message "No disk drive on this machine..." error } else {osd_menu::menu_create [osd_menu::menu_create_disk_list$::osd_disk_path]} }}} + { text "Set Tape..." + actions { A { if {[catch "machine_info connector cassetteport"]} { osd::display_message "No cassette port on this machine..." error } else { osd_menu::menu_create [osd_menu::menu_create_tape_list $::osd_tape_path]} }} post-spacing 3 } { text "Save State..." actions { A { osd_menu::menu_create [osd_menu::menu_create_save_state] }}} @@ -983,6 +991,40 @@ } } +proc menu_create_tape_list {path} { + return [prepare_menu_list [concat "--eject--" "--rewind--" [ls$path "cas,wav,gz"]] \ + 10 \ + { execute menu_select_tape + font-size 8 + border-size 2 + width 200 + xpos 100 + ypos 120 + header { text "Tapes $::osd_tape_path" + font-size 10 + post-spacing 6 }}] +} + +proc menu_select_tape {item} { + if {$item eq "--eject--"} { + menu_close_all + cassetteplayer eject + } elseif {$item eq "--rewind--"} { + menu_close_all + cassetteplayer rewind + } else { + set fullname [file join$::osd_tape_path $item] + if {[file isdirectory$fullname]} { + menu_close_top + set ::osd_tape_path [file normalize $fullname] + menu_create [menu_create_tape_list$::osd_tape_path] + } else { + menu_close_all + cassetteplayer \$fullname + } + } +} + proc get_savestates_list_presentation_sorted {} { set presentation [list] foreach i [lsort -integer -index 1 -decreasing [savestate::list_savestates_raw]] { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
 [openMSX-commits] SF.net SVN: openmsx:[12179] openmsx/trunk/src/sound From: - 2011-06-11 17:33:47 Revision: 12179 http://openmsx.svn.sourceforge.net/openmsx/?rev=12179&view=rev Author: m9710797 Date: 2011-06-11 17:33:40 +0000 (Sat, 11 Jun 2011) Log Message: ----------- Added better emulation of the Y8950 BUF_RDY status bit Before this patch, the BUF_RDY status bit was always read as '1' (at least when it was not masked). Most of the time this is good enough. But in programs like 'NOP real motion', this bit was used to control the rate at which the CPU should feed new data to the ADPCM unit (most other programs play adpcm samples via the sample-ram). But when this bit was always '1', the data was fed too fast and (because of buffer overflows??) the program crashed. Fixing this required better emulation of the BUF_RDY bit. In my first attempt I missed some corner cases and that caused new bugs (e.g. hang when 'NOP unknown reality' was checking the amount of available sample ram or uploading new samples). I checked a number of programs and they all (still/again) seem to work fine. I just wanted to say that it's not impossible that this patch causes regressions. The sound quality in 'NOP real motion' is still very bad (while on a real machine it's quite good). But that's something for a later patch. Modified Paths: -------------- openmsx/trunk/src/sound/MSXAudio.cc openmsx/trunk/src/sound/Y8950.cc openmsx/trunk/src/sound/Y8950.hh openmsx/trunk/src/sound/Y8950Adpcm.cc openmsx/trunk/src/sound/Y8950Adpcm.hh Modified: openmsx/trunk/src/sound/MSXAudio.cc =================================================================== --- openmsx/trunk/src/sound/MSXAudio.cc 2011-05-28 20:33:47 UTC (rev 12178) +++ openmsx/trunk/src/sound/MSXAudio.cc 2011-06-11 17:33:40 UTC (rev 12179) @@ -69,7 +69,7 @@ result = 255; } else { result = (port & 1) ? y8950->readReg(registerLatch, time) - : y8950->readStatus(); + : y8950->readStatus(time); } return result; } @@ -81,7 +81,7 @@ return 255; // read always returns 255 } else { return (port & 1) ? y8950->peekReg(registerLatch, time) - : y8950->peekStatus(); + : y8950->peekStatus(time); } } Modified: openmsx/trunk/src/sound/Y8950.cc =================================================================== --- openmsx/trunk/src/sound/Y8950.cc 2011-05-28 20:33:47 UTC (rev 12178) +++ openmsx/trunk/src/sound/Y8950.cc 2011-06-11 17:33:40 UTC (rev 12179) @@ -155,8 +155,8 @@ void writeReg(byte reg, byte data, EmuTime::param time); byte readReg(byte reg, EmuTime::param time); byte peekReg(byte reg, EmuTime::param time) const; - byte readStatus(); - byte peekStatus() const; + byte readStatus(EmuTime::param time); + byte peekStatus(EmuTime::param time) const; void setStatus(byte flags); void resetStatus(byte flags); @@ -1141,6 +1141,7 @@ timer2.setStart((data & Y8950::R04_ST2) != 0, time); reg[rg] = data; } + adpcm->resetStatus(); break; case 0x06: // (KEYBOARD OUT) @@ -1355,16 +1356,16 @@ } } -byte Y8950Impl::readStatus() +byte Y8950Impl::readStatus(EmuTime::param time) { - setStatus(Y8950::STATUS_BUF_RDY); // temp hack - byte result = peekStatus(); + byte result = peekStatus(time); //std::cout << "status: " << (int)result << std::endl; return result; } -byte Y8950Impl::peekStatus() const +byte Y8950Impl::peekStatus(EmuTime::param time) const { + adpcm->sync(time); return (status & (0x80 | statusMask)) | 0x06; // bit 1 and 2 are always 1 } @@ -1556,14 +1557,14 @@ return pimple->peekReg(reg, time); } -byte Y8950::readStatus() +byte Y8950::readStatus(EmuTime::param time) { - return pimple->readStatus(); + return pimple->readStatus(time); } -byte Y8950::peekStatus() const +byte Y8950::peekStatus(EmuTime::param time) const { - return pimple->peekStatus(); + return pimple->peekStatus(time); } void Y8950::setStatus(byte flags) Modified: openmsx/trunk/src/sound/Y8950.hh =================================================================== --- openmsx/trunk/src/sound/Y8950.hh 2011-05-28 20:33:47 UTC (rev 12178) +++ openmsx/trunk/src/sound/Y8950.hh 2011-06-11 17:33:40 UTC (rev 12179) @@ -56,8 +56,8 @@ void writeReg(byte reg, byte data, EmuTime::param time); byte readReg(byte reg, EmuTime::param time); byte peekReg(byte reg, EmuTime::param time) const; - byte readStatus(); - byte peekStatus() const; + byte readStatus(EmuTime::param time); + byte peekStatus(EmuTime::param time) const; // for ADPCM void setStatus(byte flags); Modified: openmsx/trunk/src/sound/Y8950Adpcm.cc =================================================================== --- openmsx/trunk/src/sound/Y8950Adpcm.cc 2011-05-28 20:33:47 UTC (rev 12178) +++ openmsx/trunk/src/sound/Y8950Adpcm.cc 2011-06-11 17:33:40 UTC (rev 12179) @@ -159,6 +159,9 @@ switch (rg) { case 0x07: // START/REC/MEM DATA/REPEAT/SP-OFF/-/-/RESET reg7 = data; + if (reg7 & R07_RESET) { + reg7 = 0; + } if (reg7 & R07_START) { // start ADPCM restart(emu); @@ -169,15 +172,15 @@ emu.memPntr = startAddr; aud.memPntr = startAddr; readDelay = 2; // two dummy reads + if ((reg7 & R07_MODE) == R07_MEMORY_DATA) { + // we're ready to accept data + y8950.setStatus(Y8950::STATUS_BUF_RDY); + } } else { // access via CPU emu.memPntr = 0; aud.memPntr = 0; } - if (reg7 & R07_RESET) { - reg7 = 0; - y8950.setStatus(Y8950::STATUS_BUF_RDY); - } removeSyncPoint(); if (isPlaying()) { schedule(); @@ -322,6 +325,22 @@ } } +void Y8950Adpcm::resetStatus() +{ + // If the BUF_RDY mask is cleared (e.g. by writing the value 0x80 to + // register R#4). Reading the status register still has the BUF_RDY + // bit set. Without this behavior demos like 'NOP Unknown reality' + // hang when testing the amount of sample ram or when uploading data + // to the sample ram. + // + // Before this code was added, those demos also worked but only + // because we had a hack that always kept bit BUF_RDY set. + if ((reg7 & R07_MODE & ~R07_REC) == R07_MEMORY_DATA) { + // transfer to or from sample ram + y8950.setStatus(Y8950::STATUS_BUF_RDY); + } +} + byte Y8950Adpcm::readData() { if ((reg7 & R07_MODE) == R07_MEMORY_DATA) { @@ -337,6 +356,7 @@ if (readDelay) { // two dummy reads --readDelay; + y8950.setStatus(Y8950::STATUS_BUF_RDY); } else if (emu.memPntr > stopAddr) { // set EOS bit in status register y8950.setStatus(Y8950::STATUS_EOS); Modified: openmsx/trunk/src/sound/Y8950Adpcm.hh =================================================================== --- openmsx/trunk/src/sound/Y8950Adpcm.hh 2011-05-28 20:33:47 UTC (rev 12178) +++ openmsx/trunk/src/sound/Y8950Adpcm.hh 2011-06-11 17:33:40 UTC (rev 12179) @@ -30,6 +30,8 @@ byte readReg(byte rg, EmuTime::param time); byte peekReg(byte rg, EmuTime::param time); int calcSample(); + void sync(EmuTime::param time); + void resetStatus(); template void serialize(Archive& ar, unsigned version); @@ -50,7 +52,6 @@ // Schedulable virtual void executeUntil(EmuTime::param time, int userData); - void sync(EmuTime::param time); void schedule(); void restart(PlayData& pd); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 

Showing 19 results of 19