fix bug in 'next media' function

olivierfriard · May 29, 2018 · 6d1b54b · 6d1b54b
1 parent e9971bd
commit 6d1b54b
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 1 deletion.
diff --git a/boris.py b/boris.py
@@ -2495,7 +2495,7 @@ def next_media_file(self):
                     # remember if player paused (go previous will start playing)
                     flagPaused = self.mediaListPlayer.get_state() == vlc.State.Paused
 
-                    next(self.mediaListPlayer)
+                    self.mediaListPlayer.next()
 
                     # wait until media is played
                     while True:
@@ -10407,12 +10407,14 @@ def jumpForward_activated(self):
 
             else:
                 if self.media_list.count() == 1:
+                    print("1st media")
                     if self.mediaplayer.get_time() >= self.mediaplayer.get_length() - self.fast * 1000:
                         self.mediaplayer.set_time(self.mediaplayer.get_length())
                     else:
                         self.mediaplayer.set_time(self.mediaplayer.get_time() + self.fast * 1000)
 
                     if self.simultaneousMedia:
+                        print("2nd media")
                         self.mediaplayer2.set_time(int(self.mediaplayer.get_time() -
                                                    self.pj[OBSERVATIONS][self.observationId][TIME_OFFSET_SECOND_PLAYER] * 1000))
 

diff --git a/test.boris b/test.boris
@@ -778,6 +778,88 @@
      "video_test_25fps_180s.mp4":false
     }
    }
+  },
+  "2 video":{
+   "file":{
+    "1":[
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4"
+    ],
+    "2":[
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4"
+    ]
+   },
+   "type":"MEDIA",
+   "date":"2018-05-29T11:01:03",
+   "description":"",
+   "time offset":0.0,
+   "events":[],
+   "independent_variables":{
+    "a":"",
+    "b":"",
+    "c":"111"
+   },
+   "time offset second player":0.0,
+   "visualize_spectrogram":false,
+   "close_behaviors_between_videos":false,
+   "media_info":{
+    "length":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4":179.96,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4":179.96
+    },
+    "fps":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4":25.0,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4":25.0
+    },
+    "hasVideo":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4":true,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4":true
+    },
+    "hasAudio":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4":false,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4":false
+    }
+   }
+  },
+  "2 video avi":{
+   "file":{
+    "1":[
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4.re-encoded.640px.avi"
+    ],
+    "2":[
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4.re-encoded.640px.avi"
+    ]
+   },
+   "type":"MEDIA",
+   "date":"2018-05-29T11:08:25",
+   "description":"",
+   "time offset":0.0,
+   "events":[],
+   "independent_variables":{
+    "a":"",
+    "b":"",
+    "c":"111"
+   },
+   "time offset second player":0.0,
+   "visualize_spectrogram":false,
+   "close_behaviors_between_videos":false,
+   "media_info":{
+    "length":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4.re-encoded.640px.avi":179.96,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4.re-encoded.640px.avi":179.96
+    },
+    "fps":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4.re-encoded.640px.avi":25.0,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4.re-encoded.640px.avi":25.0
+    },
+    "hasVideo":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4.re-encoded.640px.avi":true,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4.re-encoded.640px.avi":true
+    },
+    "hasAudio":{
+     "/home/olivier/gdrive/src/python/BORIS_mp/video1.mp4.re-encoded.640px.avi":false,
+     "/home/olivier/gdrive/src/python/BORIS_mp/video2.mp4.re-encoded.640px.avi":false
+    }
+   }
   }
  },
  "independent_variables":{