combine JingleGroupList and Musicpools to GroupList class

1 files changed, 21 insertions, 21 deletions

diff --git a/www/js/rivendell.js b/www/js/rivendell.js
index 8331093..ffa138a 100644
--- a/www/js/rivendell.js
+++ b/www/js/rivendell.js
@@ -63,6 +63,15 @@ Rivendell.Rivendell.prototype.listServices = function(success) {
   return $.post(this.rdxportEndpoint, command, success, "xml");
 };
 
+Rivendell.Rivendell.prototype.listGroups = function(success) {
+  var command = {
+    COMMAND: 4,
+    LOGIN_NAME: this.username,
+    PASSWORD: this.token
+  };
+  return $.post(this.rdxportEndpoint, command, success, "xml");
+};
+
 Rivendell.Rivendell.prototype.listGroup = function(groupName, success) {
   var command = {
     COMMAND: 5,
@@ -73,11 +82,13 @@ Rivendell.Rivendell.prototype.listGroup = function(groupName, success) {
   return $.post(this.rdxportEndpoint, command, success, "xml");
 };
 
-Rivendell.Rivendell.prototype.listGroups = function(success) {
+Rivendell.Rivendell.prototype.listCarts = function(groupName, includeCuts, success) {
   var command = {
-    COMMAND: 4,
+    COMMAND: 6,
     LOGIN_NAME: this.username,
-    PASSWORD: this.token
+    PASSWORD: this.token,
+    GROUP_NAME: groupName,
+    INCLUDE_CUTS: includeCuts
   };
   return $.post(this.rdxportEndpoint, command, success, "xml");
 };
@@ -93,17 +104,6 @@ Rivendell.Rivendell.prototype.listCart = function(cartNumber, includeCuts, succe
   return $.post(this.rdxportEndpoint, command, success);
 };
 
-Rivendell.Rivendell.prototype.listCarts = function(groupName, includeCuts, success) {
-  var command = {
-    COMMAND: 6,
-    LOGIN_NAME: this.username,
-    PASSWORD: this.token,
-    GROUP_NAME: groupName,
-    INCLUDE_CUTS: includeCuts
-  };
-  return $.post(this.rdxportEndpoint, command, success, "xml");
-};
-
 Rivendell.Rivendell.prototype.addCart = function(groupName, type, cartNumber, success) {
   var command = {
     COMMAND: 12,
@@ -134,23 +134,23 @@ Rivendell.Rivendell.prototype.removeCart = function(cartNumber, success) {
   return $.post(this.rdxportEndpoint, command, success, "xml");
 };
 
-Rivendell.Rivendell.prototype.listCut = function(cartNumber, cutNumber, success) {
+Rivendell.Rivendell.prototype.listCuts = function(cartNumber, success) {
   var command = {
-    COMMAND: 8,
+    COMMAND: 9,
     LOGIN_NAME: this.username,
     PASSWORD: this.token,
-    CART_NUMBER: cartNumber,
-    CUT_NUMBER: cutNumber
+    CART_NUMBER: cartNumber
   };
   return $.post(this.rdxportEndpoint, command, success, 'xml');
 };
 
-Rivendell.Rivendell.prototype.listCuts = function(cartNumber, success) {
+Rivendell.Rivendell.prototype.listCut = function(cartNumber, cutNumber, success) {
   var command = {
-    COMMAND: 9,
+    COMMAND: 8,
     LOGIN_NAME: this.username,
     PASSWORD: this.token,
-    CART_NUMBER: cartNumber
+    CART_NUMBER: cartNumber,
+    CUT_NUMBER: cutNumber
   };
   return $.post(this.rdxportEndpoint, command, success, 'xml');
 };