mxapi Barlines (#12)

webern · Jul 17, 2017 · 87deb22 · 87deb22
1 parent 214e37e
commit 87deb22
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 245 deletions.
diff --git a/Sourcecode/mx/api/BarlineData.h b/Sourcecode/mx/api/BarlineData.h
@@ -20,7 +20,11 @@ namespace mx
             normal,
             lightLight,
             lightHeavy,
-            heavyLight
+            heavyLight,
+            dotted,
+            dashed,
+            heavy,
+            heavyHeavy
         };
 
         class BarlineData

diff --git a/Sourcecode/mx/impl/Converter.cpp b/Sourcecode/mx/impl/Converter.cpp
@@ -331,13 +331,13 @@ namespace mx
         const std::map<core::BarStyleEnum, api::BarlineType> Converter::barlineMap =
         {
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::regular, api::BarlineType::normal },
-            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dotted, api::BarlineType::unsupported },
-            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dashed, api::BarlineType::unsupported },
-            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavy, api::BarlineType::unsupported },
+            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dotted, api::BarlineType::dotted },
+            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dashed, api::BarlineType::dashed },
+            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavy, api::BarlineType::heavy },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::lightLight, api::BarlineType::lightLight },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::lightHeavy, api::BarlineType::lightHeavy },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyLight, api::BarlineType::heavyLight },
-            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyHeavy, api::BarlineType::unsupported },
+            std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyHeavy, api::BarlineType::heavyHeavy },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::tick, api::BarlineType::unsupported },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::short_, api::BarlineType::unsupported },
             std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::none, api::BarlineType::none },

diff --git a/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/Mx.xcscheme b/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/Mx.xcscheme
diff --git a/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/dylib-iOS.xcscheme b/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/dylib-iOS.xcscheme
diff --git a/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/dylib-macOS.xcscheme b/Xcode/Mx.xcodeproj/xcshareddata/xcschemes/dylib-macOS.xcscheme