Merge branch 'master' of https://github.com/ccrisan/motioneye into movie-playback

diff --cc motioneye/handlers.py
index f36f745b8d5290967e594468a984e76347d6edcf,18739aabe3c9d4d9161bcaa3da57cf744b23d4db..d4cb1fd38a72bd0c5abbdc886d1584d9de354dfe
--- 1/motioneye/handlers.py
--- 2/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@@ -1339,16 -1427,16 +1428,15 @@@ class MovieHandler(BaseHandler)
                  'filename': filename, 'id': camera_id})
          
          camera_config = config.get_camera(camera_id)
-         if utils.local_motion_camera(camera_config):
+         if utils.is_local_motion_camera(camera_config):
              content = mediafiles.get_media_content(camera_config, filename, 'movie')
 -            
 +
              pretty_filename = camera_config['@name'] + '_' + os.path.basename(filename)
 -            self.set_header('Content-Type', 'video/mpeg')
 +            self.set_header('Content-Type', mimetypes.guess_type(filename)[0] or 'video/mpeg')
              self.set_header('Content-Disposition', 'attachment; filename=' + pretty_filename + ';')
 -            
 +
              self.finish(content)
- 
-         elif utils.remote_camera(camera_config):
 -        
+         elif utils.is_remote_camera(camera_config):
              def on_response(response=None, error=None):
                  if error:
                      return self.finish_json({'error': 'Failed to download movie from %(url)s: %(msg)s.' % {

diff --cc motioneye/mediafiles.py
Simple merge

diff --cc motioneye/remote.py
Simple merge

diff --cc motioneye/static/css/main.css
Simple merge

diff --cc motioneye/static/js/main.js
index 7944496021abc30cdba65c2fb2bef5333c02c3de,b978106dd3a955eb2817ef4c859d0901025473f1..16c68ab49512070319b62ea48d8d16b2302754a5
--- 1/motioneye/static/js/main.js
--- 2/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@@ -3009,14 -3360,13 +3412,14 @@@ function runPictureDialog(entries, pos
              }
              else {
                  img.height(height);
 +                video_container.height(height);
              }
              updateModalDialogPosition();
-             prevArrow.css('display', pos > 0 ? '' : 'none');
-             nextArrow.css('display', pos < entries.length - 1 ? '' : 'none');
+             prevArrow.css('display', pos < entries.length - 1 ? '' : 'none');
+             nextArrow.css('display', pos > 0 ? '' : 'none');
              progressImg.remove();
          });
 -        
 +
          $('div.modal-container').find('span.modal-title:last').html(entry.name);
          updateModalDialogPosition();
      }