search

mihaiolteanu / vuiet

The music player and explorer for Emacs
https://mihaiolteanu.me/vuiet
GNU General Public License v3.0
278 stars 15 forks source link

Add possibility to pause and continue with mpv. #45

Closed firmart closed 3 years ago

firmart commented 3 years ago

Fix #44. Also Fix #36.

mihaiolteanu commented 3 years ago

Doable, but not mergeable due to conflict :)

firmart commented 3 years ago

I don't have write access, so I can't resolve it. Could you do it ?

mihaiolteanu commented 3 years ago

If you would try to now merge this branch with the updated master branch, you should be able to see the conflicts. I think you've changed the same code on more than one branch. That would mean I can only merge one of them, and for the rest....conflicts :) 

<<<<<<< patch-continue-on-mpv
     (vuiet--youtube-link-at-position))))

(defun vuiet-playing-track-continue-with-mpv ()
  "Pause vuiet and continue playing with mpv as a new process."
  (interactive)
  (vuiet-play-pause)
  (when (vuiet-playing-artist)
    (start-process "vuiet" nil "mpv"
           (vuiet--youtube-link-at-position))))
=======
     (concat "https://www.youtube.com/"
             (mpv-get-property "filename")
             "&t=" (int-to-string
                    (round (mpv-get-playback-position)))))))
>>>>>>> master
firmart commented 3 years ago

Thanks!

mihaiolteanu commented 3 years ago

Please update the README, also!