dont show play and add-to-playlist at the same time

diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index a9e10b3d40f5cdc7a7243c5f472f8be11ae94643..6c8c564431033c97b30c3c274b32b3c75c465770 100644 (file)
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -24,22 +24,25 @@ $(document).ready(function(){
                        data[itemParts[0]]=decodeURIComponent(itemParts[1]).replace(/\+/g,' ');
                }
                var media=Collection.find(data.artist,data.album,data.song);
-               var button=$('<input type="button" class="play"></input>');
-               button.css('background-image','url('+OC.imagePath('core','actions/play')+')')
-               button.click(function(){
-                       var oldSize=PlayList.items.length;
-                       PlayList.add(media);
-                       PlayList.play(oldSize);
-                       PlayList.render();
-               });
-               row.find('div.name').append(button);
-               var button=$('<input type="button" class="add"></input>');
-               button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
-               button.click(function(){
-                       PlayList.add(media);
-                       PlayList.render();
-               });
-               row.find('div.name').append(button);
+               if(!PlayList.playing()){
+                       var button=$('<input type="button" class="play"></input>');
+                       button.css('background-image','url('+OC.imagePath('core','actions/play')+')')
+                       button.click(function(){
+                               var oldSize=PlayList.items.length;
+                               PlayList.add(media);
+                               PlayList.play(oldSize);
+                               PlayList.render();
+                       });
+                       row.find('div.name').append(button);
+               }else{
+                       var button=$('<input type="button" class="add"></input>');
+                       button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
+                       button.click(function(){
+                               PlayList.add(media);
+                               PlayList.render();
+                       });
+                       row.find('div.name').append(button);
+               }
        }
 });
 

diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 2e910bc0d598a41783c47ef15fcdc02d1112bc93..ebb8044598c21b6c2f1ce063a0c47552bb619e84 100644 (file)
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -104,5 +104,12 @@ var PlayList={
                PlayList.items.splice(index,1);
                PlayList.render();
        },
-       render:function(){}
+       render:function(){},
+       playing:function(){
+               if(!PlayList.player){
+                       return false;
+               }else{
+                       return !PlayList.player.data("jPlayer").status.paused;
+               }
+       }
 }