fix for Qt 5.2 compat & update ubuntu script

bylee20 · May 2, 2015 · 293d32c · 293d32c
1 parent a323da3
commit 293d32c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/debian/build.sh b/debian/build.sh
@@ -1,11 +1,11 @@
 #! /bin/bash
 
-ver=$1
-distro=$2
-rel=$3
+ver=$(git describe | sed 's/v\([0-9]\+.[0-9]\+.[0-9]\+\).*/\1/')
+distro=$1
+rel=$2
 
-if [ -z "$distro" ] || [ -z "$ver" ]; then
-  echo "Usage: $0 <version> <distro> [<rel>]"
+if [ -z "$distro" ]; then
+  echo "Usage: $0 <distro> [<rel>]"
   exit
 fi
 
@@ -72,4 +72,4 @@ sed -i "s/@bdeps@/$bdeps/g" control
 sed -i "s/@deps@/$deps/g" control
 sed -i "s/@opts@/$opts/g" rules
 
-debuild -S -sa
+debuild -S -sa
diff --git a/src/bomi/player/mrl.cpp b/src/bomi/player/mrl.cpp
@@ -144,11 +144,11 @@ auto Mrl::toCueTrack() const -> CueTrack
 {
     if (!isCueTrack())
         return CueTrack();
-    const auto strs = m_loc.midRef(6).split(u":;"_q);
+    const auto strs = m_loc.mid(6).split(u":;"_q);
     if (strs.size() != 4)
         return CueTrack();
     CueTrack track;
-    track.file = strs[1].toString();
+    track.file = strs[1];
     track.start = strs[2].toInt();
     track.end = strs[3].toInt();
     return track;