diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 00bcd8f..2536580 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -169,30 +169,6 @@ Item { currentServiceItem++; loadVideo(); } - /* print(textIndex); */ - /* if (itemType === "song") { */ - /* if (textIndex === 0) { */ - /* SlideObject.setText(root.text[textIndex]); */ - /* print(root.text[textIndex]); */ - /* textIndex++; */ - /* } else if (textIndex < root.text.length) { */ - /* SlideObject.setText(root.text[textIndex]); */ - /* print(root.text[textIndex]); */ - /* textIndex++; */ - /* } else { */ - /* print("Next slide time"); */ - /* textIndex = 0; */ - /* clearText(); */ - /* nextSlide(); */ - /* } */ - /* } else if (itemType === "video") { */ - /* /\* clearText(); *\/ */ - /* nextSlide(); */ - /* } */ - /* else if (itemType === "image") { */ - /* /\* clearText(); *\/ */ - /* nextSlide(); */ - /* } */ } function nextSlide() { diff --git a/src/slide.cpp b/src/slide.cpp index fe11372..e3039d3 100644 --- a/src/slide.cpp +++ b/src/slide.cpp @@ -200,21 +200,13 @@ bool Slide::next(QVariantMap nextItem) return true; } - if (m_type != "song") { - qDebug() << "nextslide current type is song"; - // setText(""); - // changeSlide(item); - } - - if (m_type == "song") { - // since the string list is 0 indexed m_slideIndex actually - // maps to the next item. - int nextTextIndex = m_slideIndex; - qDebug() << nextTextIndex; - qDebug() << text[nextTextIndex]; - setText(text[nextTextIndex]); - m_slideIndex++; - } + // since the string list is 0 indexed m_slideIndex actually + // maps to the next item. + int nextTextIndex = m_slideIndex; + qDebug() << nextTextIndex; + qDebug() << text[nextTextIndex]; + setText(text[nextTextIndex]); + m_slideIndex++; return false; }